Before you fly toward Thailand apply for the Single Entry Non Immigrant O visa based on over 50 years of age (Retirement) and get 90 days of stay when you enter. Have plenty of time to organize the copies and apply after 60 days of stay for the 1 year Extension of Stay.
Less visits to Immigration, less cost, less hassle.
It is available, you just need to meet this requirement: Multiple-Entry Tourist Visa will only be granted to Lao nationals or those with proof of permanent residence in Laos.
No, not for the conversion into Non Immigrant O visa, than you just need minimum 400.000 Thb on a Thai Bank account on your name only and for the 1 year Extension of Stay based on being married to a Thai citizen it must be in a Thai bank account for at least 2 months prior application date.
If shared bank accounts you need the 400.000 Thb multiplied by nameholders bank account.
Please show us the rule change from 2 months prior application a minimum of 800.000 thb in a Thai bank account on your name until 3 months after approval of the Extension of Stay and the rest of the year not less than 400.000 Thb into as you try to tell us.
You wrote: "Unless they told you to show up in 90 days to prove you still have the 800k, you can move it immediately. You can even send it back to your home country." Which is against the rules. So please show us the police order with the changes.
You need at least 15 or 21 days left on your current permitted to stay period. As you mention the last day is May 20th and today is May 8, the count is 12. Nothing to do with the way you entered Thailand. Leave Thailand, come back with new Visa Exempt Entry for 30 days and go the next morning to the Immigration Office for the conversion.