@Toby *********
Once I have the yearly extension, would this leave me with a single entry visa or a multiple entry?
Non-O visas and extensions inside the country are sold without ANY re-entry you buy that after you get the year extension
You would apply for the Non-O visa, when you have a minimum of 15 days left on your current entry stamp for 2000baht by meeting the requirements at the immigration office where you stay. It will go under consideration for between 14 and 20 days depending on the office you use and you CANNOT leave the country during that time. Then you go back to get the Non-O visa and a new 90 day stamp inked into your passport. THEN you buy a re-entry permit that will be valid ONLY for those 90 days (either single entry for 1000baht or multiple entry for 3800) THEN you wait until you have 30 days or less left on that 90 day stamp and you go apply for a yearly extension for 1900baht. You will get a 30 day under consideration stamp THEN if you need to leave the country during that month you need to buy ANOTHER re-entry permit which will be valid ONLY for that stamp. When that 30 days runs down you go back and get the year extension inked in and then you buy the final re-entry permit inked in which will last for the whole year extension
SO because of your traveling you're going to need to buy THREE different re-entry permits, one to cover the 90 day Non-O visa, one to cover the 30 day under consideration and then the final one to cover the year extension
OR
As I said you slog on over to Savannakhet and get a year-long, multi-entry Non-O visa that lets you come in and out all you want for a year getting a 90 day stamp each time you enter
Your traveling is the reason I said use savannakhet NOT screw around with getting a Non-O and then a year extension inside the country or even getting a single Non-O from Singapore and coming in and getting the extension it's just a LOT of hoop jumping, BUT I will leave you to make your own decision