Thanks Brandon and everyone. It's not easy walking through these Visa applications and so on. You are right about the use of the word " Pensioner visa, I do mean retirement extension. Owe you all a Leo when I am there in a few weeks. Thanks again.
I am heading to Thailand next month, and based on feedback, I am going to apply for the 90 day non immigrant and apply for the O retirement Visa when in Thailand. Would be interested in knowing how you go. Good luck.