I hear you! And I feel your anxiety. Here's what I would do. Wait until, say, July 15-20 ish. If no amnesty extension announced, start looking seriously at flights out. Perhaps spring for a flexible ticket and hope for a good announcement at the last minute. What I wouldn't do(!!), as mentioned above, is running any chance of an overstay.
That said, and I'm gonna pull speculation straight out of my ass, I believe they will extend. But wouldn't advise anyone to just rely on that.
Aside from it looking bad, if you ever had an overstay, you can't use certain fast track immigration services. Thai Elite will not be an option. I would avoid it like the plague.
Yeah, in my case it took more than a month. I lost some time due to annoying banks. But I don't think I could've made it in a month. I'd not recommend anyone inside the country start the process now. Would need some post July 31 clarity.