Can You Convert a Tourist Visa to a Non-O Visa (Married to a Thai) in Thailand?

and just like that we're done.

I will NOT let speculation and conjecture about what they "might do" on the group.

Stick with what you CAN do now, and wait for the announcements about what will happen when amnesty runs out.

IF you are still on the original 60 day tourist visa entry OR have a 30 day extension OR a 60 day visit thai family extension you CAN apply for a 90 day Non-O visa based on marriage to a thai at most immigration offices. You need between 15 and 21 days left on your current stamp (depending on the office), you need to meet the proof of having 400K baht in a thai bank account in your name only that was transferred in from overseas, and supply the required documents

You CANNOT do this process if you are on amnesty now.