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.