I was under the impression that if you returned to your registered address when you returned to Thailand, then there was no need to resubmit a TM30, a copy of which is already stapled in your passport. Certainly that is the case at Hua Hin immigration, in my experience.