the important thing with Chiang Mai immigration seems to be to make an appearance in person and affirm nothing about your previous TM30 has changed and they normally choose to issue a new one on the spot
Get the affidavit of income arrive visa exempt. Immediately get a non o 90 days and convert to one year after 60 days on the 90. Depending on your financial income situation you can both probably qualify for your own non o retirement and make life easier