Quite correct. Thai immigration in Lopburi advised me to do this . Went for a break in Savannaket in Laos to get 90 day non-o visa. Extension no problem. If you go this way, I believe you may need an appointment at the Thai consulate. Good luck.
Why not have a break at Savannaket In Laos, just over the border. The Thai consulate can issue a 90 day non.o visa . Takes 2 days. You can then extend it for 1 year retirement towards the end of this period .