If evisa is available, get an evisa from Thai Embassy from your home country. Evisa good for 60 days. Don't have to worry about spending vacation time at immigration office.
Easiest thing is to get a multiple entry visa in your home country, each entry good for 60 days. Don't have to spend time during your vacation getting visas.
I had the same thing happen to me. I saved the 60 day visa for a future trip. And did a weekend trip to Cambodia and re-entered Thailand 30 day Visa Exempt.