Am I covered by the visa amnesty if my Non-O marriage extension expires?

Paul Collins, yes. What you are on now is simply to visit your family. You are entitled to apply for a formal one year extension based on marriage/Thai wife, as long as your current 60 day extension does not expire. For the financial requirement you must have bt400k in the bank for at least 2 months, or have bt40k at least coming in from overseas, and you can not do that on the 60 day extension. This is why they give a 90 day extension, so you have time to complete it. If you do not do it, then your extension simply expires. When I did it, I was having problems getting some of the documents, and they saw I had been getting the rest, so they gave me an extra 30 day extension added to the 90 days, but only because I had the financial part done, and was still waiting on my lease documents, with the owner's ID card copies, and his house registration book copy, with his name in it.