@Dan***
and
@Da***
your best bet is to sit tight NOT waste a cent talking to a lawyer or an agent and take the amnesty until the borders open and you can go to one of the thai consulates in the area that will sell a year-long, multi-entry Non-O visa based on marriage to a thai without proof of funds (Savannakhet Lao or Ho Chi Minh City Vietnam) :)
As
@Ja***
correctly stated you're a good long way off from running out of time at this stage of the game. Take the amnesty, sit tight, watch the news and make a plan closer to the time the amnesty ends.