I was on a Non-O based retirement extension for one year. I then converted to Non-B, then work permit extension for many years. In October 2023 I exited to Cambodia, returned on a Visa Exempt (US passport), obtained a Non-O for retirement in Thailand at CW, then got my retirement extension in January 2024. So, in my case, there was no issue with the Non-O, other than needing a lease, being 50+, and having 800K in the bank.