If you make a donation of at least 500 bht to one of the charities promoted at the amphur office - you will probably find things will speed up considerably.
Prefer not to have to exit the country as always a risk of being declined entry again. Maybe best to actually call into the immigration office and ask them directly.