@Garrett **********
I hope everything gets back to normal as soon as possible. But I've thrown out my crystal ball because it has proven to be defective. ;-)
But my point was that there are sound reasons to prefer a Non-O over the Non-OA just because of the Thai health insurance requirement that Thai Immigration has imposed on the Non-OA but not on the Non-O.
And, unfortunately, the pandemic has made the Non-OA even less desirable now because due to quarantines and such it is now much harder to leave and re-enter Thailand, which is necessary to take full advantage of the Non-OA (you can get almost two years permission to stay out of a single Non-OA visa if you do a border run just before it expires after the first year).
In the past Non-OA did have advantages over Non-O, but with the ongoing insurance requirement and the pandemic making entering Thailand more difficult they have all disappeared, in my opinion.