@Mark *********
then I would suggest you do one more. Use Mae Sai border if closest to Chiang Mai. Step out...back in. Stamped in for 30 days plus 30.days extension available at Thai Immigration...1,900 Thai baht. Read Mai Sae TOPIC .
But may I add...as you are living in Thailand get the CORRECT VISA ...yada yada yada.
You know what I mean. Times ARE changing.
Good Luck!