@Anne ******
- This Visa used to be issued much more often. But is rarely issued now. Consider this... I/Os put obstacles in your path to elicit "tea money" under the table. As I said, find a Visa Agent... hopefully the agent will not charge more than 15,000 Baht.
I/Os much prefer to deal with agents because they feel large "tea money" payments will be kept totally quiet dealing with Agents.
I suggest this because you have no realistic way to do a Border Run to get another 90 day stay under the Non Imm O Multi-Entry Visa. The Agent may say they cannot do it or they will want to charge a lot more... But if you have some cash - take a chance.
The alternative to wait until this new "Grace Period" sets in means your Non O could / would expire. If you chose to or are pushed to leave Thailand - it could take months and lots of big money to get back in (Covid-19 Insurance, Long Quarantines, plus other expenses).