Can I extend my Tourist Visa in Thailand or should I wait until July?

As you entered Thailand on a Tourist Visa and its permission to stay date has ended ...you are covered by the Amnesty Extension program to July 31.

Its automatic...

no need to go to Thai Immigration.

Good luck...but its now a good time to plan and be prepared with a plan to either depart or to obtain a correct visa to stay.

We do not know what will be the rules on or after at July 31.

> I already extended for the extra 30 days but that is also expiring now in May.

You can only extend your tourist visa once. Some immigration offices do sell an extension of stay denied stamp for 1,900THB, which will give you 7 days to leave Thailand. However, with the amnesty scheme, I highly doubt immigration would sell you that extension of stay denied stamp, and just tell you to go on amnesty.

>Should I wait till end of July before I go to immigration like my embassy suggested? Or should I go to immigration now?

When your current stamp expires, you will automatically go on the amnesty, and you can stay no later than July 31, 2020. There is nothing else you need to do. It is unknown what would happen on August 1, 2020 though, or what further steps you need to take.