Were you married in Thailand because, if not, there are things you can do with your foreign marriage certificate before you travel to make getting your extension easier?
I think you are assuming that the Non-OA is the 12 month extension for the Non-O but they are two different initial retirement visas with different requirements