@Benjamin *****
something is not correct in your remarks. You say "but if you do leave Thailand without a re-entry permit, and you're on an extension of stay based on married, you must get a new extension of stay based on marriage to a Thai national" . . .this is wrong. He will have to get a NEW Non-Imm-O visa based on marriage to a Thai . . (before he hasn't gotten the visa, he cannot apply for the extension)