OP, obviously you plan to exit Thailand without a reentry permit to kill off the non O-A and reenter visa exempt.
To obtain a non O retirement you need to show the funds (800k) came from o/s.
Usually if you can show the funds have been in Thailand for some time then that is not required.
Which immigration will you use.