I'm in almostj the same situation. Extension ran out in March.
I lived in Thailand for almost 2 years doing the 30-Day exemption thing, the Thai immigration caught on to what I was doing and warned me - twice - that I could not live in Thailand on exemptions and would have to get a visa or be turned back the next time. So I started flying down to KL in Malaysia and getting 2 month Tourist visas and buying an additional 30 day extension when that ran out. They seem satisfied with that arrangement and I've had no problems since.
As for extending the Amnesty I doubt if anyone actually KNOWS what they will do, so I am making contingency plans. I suggest you do too. Hope for the best and plan for the worst.