@Eric *******
then IF you are going to fly out before the 21 of July just leave.
BUT
if you're still here on that date, GO to the same immigration office you got that stamp and they'll "close the loop" on your covid extension.
AND
Just so you know; most offices issue the 60 day covid extension in TWO stamps. You apply, pay the 1900baht get an under consideration stamp and on the date that stamp says you go back with your passport and the blue/green receipt paper showing you paid and they ink the covid extension in.
So you weren't shorted any time, you didn't get ripped off, you didn't know what you were getting is all ;)