Thanks to everyone for helping me see a little clearer through the ever present Thai fog laid over everything. "Why make it simple when we can make it complicated?"
Okay, so I will come back to Thailand again on my current OA before it expires, with health insurance, and will get a one year stamp. Then if I need to leave TH before end of that year, I will top up account to 800k+ baht and before I leave Thailand get a non-O visa with re-entry permit so I can come back again on that non-O visa.
How does that sound?
Question: Is there no benefit in already having a valid OA when applying for a new non-O?