Just go travel cambodia for a while, then say Vietnam for a bit, bring your girl. When you arrive back, your stamps will look like your a tourist. Stay out of country for a few weeks or so. When you arrive back. Focus on the proper visa before you get denied in the future.
I'd say for the time being, register your marriage in thailand, by that time the entry may be 60 days, and you can just apply for visit family 60 day. That give your your 4 months. Is it's only 30 days on arrival you can still do a visit family 60 day, that will give you 3 months.
Until you figure out if this is going to be a permanent spot. Then just do your married to thai non o.
Usually, if you leave the country amd come back to the same address you have to file your tm30. If traveling around thailand and come back to same address you do not have to file again.
This information came from two different immigration office's.
Best to go ask what they would like, but I'm sure they will tell you this.
If your looking at a couple weeks earlier, you could probably get away with it. But from the sounds of it, you are not even a year into your two year.... no way they will renew it. You get the 24month license first to prove you are a responsible driver, if you are, you will be upgraded to the 5 year renewal.