Sabai Sabai, this FB Group is run what I would consider the best Visa Agent in Thailand who will outline your best option. Contact them for taking all the hassle out of your situation.
you won't have to wait a day, just get there before the immigration office opens, fill out the extension forms and have your photos, and you should be in and out within 2 hours. Then go do some holiday exploring.