If you want to travel in and out of Thailand as you visit other countries I'd suggest a multi entry Tourist Visa. Valid for 60 days but unlike the single entry you can come back to the Kingdom should you desire .
We can do that until our visa expires if we haven't changed addresses. Informed by Immigration when TM 30's became the vogue as I was filling out a new one at the Promenade office second floor. That's what I now do.
I live at home with my family ( Thai wife ) have a non immigrant 0 based on marriage and do not miss going to the CM Promenade Immigration Office when ever I return to the Kingdom as required by the Thai authorities. We can bring the same TM 30 if we haven't changed addresses. No need to fill out a new one if you meet that criteria. They require a new one only when your visa expires. If you are a little later then 24hrs there shouldn't be a problem. I wouldn't push it more then a week and I myself go within 48 hrs to be done with it.