Can I Apply for a Non-B Visa at Changawatta in Thailand?

Is it possible for me to apply for my Non-B at Changawatta? If so what exactly do I need? I am in a bit of tough situation as I have been in Thailand since December on a Non-O and went to Laos to apply for my Non-B in March since my visa was about to expire. But when I arrived at the Savannakhet office they said they were no longer accepting Non-b applicants due to fake paperwork reasons and told me to go to Vientiane (this happened very recently and no formal announcement was made so I didn't know until I got to Laos). The border to Laos closed a day later so I could not make it to Vientiane in time.

I had to return to Thailand on a visa exempt which expires on April 18th. I assume I am okay until the 30th so I am not sure if I should go to immigration to either a). attempt to apply for the non-b in Bangkok, b). pay 1900 baht for an extension before the 30th so I am good until May or c). Wait until Thailand possibly gives further amnesty and hope I can get to Laos or another country in May to apply for my non b.

Any advice is greatly appreciated. I live here and have my job so I am trying really hard to stay obviously.