@Chris ********
shouldn't have any problem, Immigrations in Hua Hin can indeed issue 90 day Non-O visas.
Before you bounce out and back go to the immigration office and get the hand out listing the required documents/copies to apply for the initial 90 day Non-O visa.
Then you know what to do once you come in on that 30 day visa exempt entry