Yes. Just go in and ask to update. All you need is your passport and your old tm30 slip. Only done at the main office near the airport…behind the drive up 90 day report window. Not done at Central Festival. Takes five minutes
Why not enter visa exempt and then apply in Thailand for a Non-O visa and then the annual extension thereof? Do you have funds available to deposit in Thailand?