What Should We Do About Our METV Expiring Soon in Thailand?

Hi Everyone,

I've scanned around and haven't seen anyone in my particular situation so here it goes.

My partner and I entered Thailand 5 Feb on a 6 month METV which expires 22 July. The initial 60 day stamp we extended and new expiry date was set for 1 May. At the time we were expecting to border bounce to come back to use our next 60 day visa, obviously that didn't happen as everything shut down. On April 7, immigration came to the island and gave us a new stamp expiring 1 June but on 8 April the amnesty was given to everyone. So we have not technically used our next 30 day extension but we also haven't gotten to use the full 6 month METV either because we didn't exit/re-enter in order to obtain another 60 days.

We are making arrangements to head to immigration before 22 July, to ask and find out what we can do. Would you suggest Koh Samui or Surat Thani immigration office? I've heard that Surat Thani is more of a main office than Samui so we might have better luck there.

Thanks for any and all help!