@Brandon ***********
Thanks for the advice. I'll go ahead with the new non O retirement visa application in Ireland. Immigration said before I left I can apply once I have 45 days left on visa . Application made from within Thailand appears to be a lot more work.