Given that you get your OA retirement visa, the nice thing is that at the moment you will be good for a year then by leaving and returning to Thailand you will receive another one year extension for free. So in effect you will have two years for the trouble you are now having on all the paper work. Been there, done that. Good Luck and try to keep the blood pressure down.