@Todd ********
No and yes. No, there is definitely cracking down. In the past they've been pretty lax about people coming in on visa waivers and going away again for a few days and then coming right back asking for a new visa waiver/exemption. Yes, this enforcement level is how the system is supposed to work. The laws regarding it haven't changed (yet) but the enforcement has increased. Representatives of the Thai government have stated it and members of this group, and others, have noted that enforcement has increased.
"Foreigners can enter Thailand under the Tourist Visa Exemption category for 30 days at one time with a maximum of 3 times in a 6 month period by flight and 2 times a year for overland crossing."
If you plan on traveling on this type of visa you are restricted to how many times you can do it within a set period of time and it can impact future travel to Thailand. If the OP is only planning on doing this single trip this year a visa run could solve the problem of needing a new visa waiver...but it does not solve the onward ticket issue needed to get the visa in the first place. And this is also one of the things that they have been cracking down on according to members of this very group.