For Your Information ONLY;
I will post this as information and close the comments.
We have NO idea what will happen when amnesty runs out BUT it appears that the government is "mulling" over some options.
Sit tight, don't panic, wait it out..
TLDR : Answer Summary
This post informs expats about the current situation regarding the upcoming end of the amnesty period in Thailand, indicating that the government is considering options but no definitive plans are in place yet.