Recommend a Non-O applied for through your home country’s Royal Thai Embassy/Consulate. Arrive, deposit required funds in a Thai commercial bank for 60 days and then apply for 1 year extension. On going requirements will include 90 reporting (hopeful it’s on line soon) and annual extensions at Immigration.
**********************************************************