Just a suggestion.. If you decide to move to Non O retirement and extensions, suggest that you obtain the Non O in home country or outside of Thailand.
Granted in your case with the 800k in bank for quite some time, the proof funds came from abroad is not a problem.
However better option than enter visa exempt and apply for Non O in Thailand. imo.