Am I eligible for the July 31 amnesty with my current visa situation?

Hi guys.

My question is :

Do I pass for the July 31 amnesty ?

Back ground :

UK passport holder, married to a Thai.

Non O visa from London single entry 90 days.

Arrived January 15. 2020.

Visa expired April 12.

Went to immigration before expiry date, around mid - March and extended for 60 days for fee of 1,900 B.

This current extension will expire on June 12.

* Now, I did originally have a return flight to London on May 12.

My airline Etihad cancelled this flight and advised me to book another date, which I managed to do for July 12.

So I have June 12 - July 12 to cover.

I understand that things might change but could do with back up info.

Thanks guys.

Cheers.