What should I do with my Thai retirement visa extension if I am relocating to Hungary for a job and married to a Thai citizen?

I just obtained my first retirement visa extension, however I have accepted a job in Hungary as an ESL instructor for a full school year, and possibly more if we like it. I will leave about a month before my first 90 day reporting deadline. I have also married a Thai citizen. We may or may not return to Thailand before the annual renewal/expiration deadline (but we could if we had to). I was thinking about allowing the retirement extension on my Type O non-immigrant visa to expire and obtain a new Type O non-im. visa in Hungary before I return and start the process over with a marriage visa extension application when we get back. Any thoughts or suggestions?