@Todd ********
you're done, IF you went on amnesty you're not able to get any in country Non-immigrant type visa issued by an immigration office.
You'd have had to have started that process BEFORE you went on amnesty.
All you can do now is take th amnesty, watch for the announcement by the government about what people on it do when it runs out,
Once the borders open back up see if you can exit/re-enter the country to get a NEW 30 day visa exempt entry.
Then immediately apply for an in country 90 day Non-O visa based on retirement by showing that you have 800K baht in a thai bank account in your name only transferred in from overseas
That's about it right now other than using an agency to get you an under the table, back door, visa/extension..