apologies for my terminology, I was just trying to distinguish between having a visa, as you describe, from a Consulate or the visa exempt entry 'just fill the card in on the plane'.
Thanks for explaining that you could indeed convert the visa exempt entry to the Non O.
The next stage would then be to look to extend based on the Retirement criteria.
As I guess you know only too well, there are a lot of posts regarding the visas and I had seen some conflicting advice about whether you could apply for the Non O if you had entered Thailand via a '30 day fill the card in on the plane' visa or if you entered using a TR tourist visa.