2 Years is a long ways away in Terms of Thai Policies which in recent Years change like the Weather. Seems you are set. Best advice I could give you is to use a Reputable School House. There 1000s Fake/Scam Language Schools just so you can stay in Thailand Longterm !