What should I consider regarding my upcoming flight and visa status for re-entering Thailand with a non-immigrant O visa?

Hi all

Wondering if I could please get some advice on my non-immigrant O (retirement) visa, relating to the crack-down on visa exempt entry and what to do with my upcoming flight

In 2025 I entered Thailand at BKK 3 times visa exempt; 2 weeks each time, returned to my home country afterwards. No overstays.

26 December 2024 - 12 January 2025

6 February 2025 - 24 February 2025

11 June 2025 - 25 June 2025

I then applied for a non-immigrant O visa in my home country and re-entered Thailand from September 26 until December 6, at which time I had to return home without having a chance to apply for a 1 year extension. The non-immigrant O visa expired on December 26.

I have a Thai bank account and the 800,000 baht well seasoned.

I have a flight booked for January 14, my plan is to enter visa exempt and then convert back to a non-immigrant O at Jomtien

Would immigration count the non-immigrant O time spent in Thailand when considering visa exempt entries? I’m only just over 100 days in the country in the last year even if this time is included.

If I have an onward flight booked, a few days of hotel bookings and 20,000 baht equivalent in my wallet, am I safe for my flight in 3 days? I feel very unsafe

Cheers