Am I covered by the latest visa amnesty after my extension expires on June 3, and when can I apply for a Non-Imm 'O' visa?

Hi, hope you guys can assist with my queries, please.

I was on a Non-Imm 'B' extension based on work. Finished my employment, cancelled the work permit and extension on March 6, hopped into Laos and back on the same day with 30 days visa exempt.

On April 3, (before the first visa amnesty was legal) Immigration gave me the choice of a first standard 30 day extension to my 30-day visa exempt or a 60-day extension based on marriage. I chose the 60 days. This expires on June 3.

So, my questions are:

(1) When my extension expires on June 3, am I covered by the latest visa amnesty until July 31?

I had intended to get a Non-Imm 'O' based on marriage from Laos, but they shut the borders before I could get there. This would still be my first-choice plan, unless there are impossible requirements for re-entering Thailand, because I would rather not have to deal with my local immigration. Will have to wait and see.

(2) If I prefer to wait and see what happens, can I apply for a Non-Imm 'O' in Thailand anytime up to 15 days before July 31 as a 'Plan B', or do I have to apply at least 15 days before my current 60-day extension based on marriage expires on June 3?

Thanks in advance for your help! :)