What Options Do I Have to Avoid Overstaying My Non B Visa in Thailand?

I think Thai immigration is realising what a major disruption this is for all. It's going to need a team effort between Immigration and peoples Consulate's and Embassie's. 'Jump on a plane back home' is either not an option, financially possible, nor a fair expectation for long term people who have house, family, car, bike, pets, assets and a happy life (all before this crisis hit)

It's a bit of a mess right now (understandably) but all countries realise this is a time to come together and show compassion. If you have a problem, be proactive, ask questions, do research and make some noise to your embassy / consulate and to whatever extent you can...Thai immigration. Don't stress, common sense will prevail, but we will have to push it along ;)