@Steven ********
yes but get the 30-day extension first. As immigration are cracking down on visa exempt entries especially in airports i suggest using a border bounce company for your 2nd one (hopefully you don't have excessive Visa Exempt entries) if you have andxare pulled aside have
1. 20k baht cash in your pocket.
2. Proof of address of stay .
3. Proof of onward travel from Thailand.