@Matt *******
whether or not you will need a flight out of Thailand within the 30 days will depend more on your airline than Thai immigration so ask them. But note it doesn't have to be a return flight, just a ticket out of Thailand is generally sufficient so you could get a cheap ticket to a nearby country if it's an issue and just not use it