I would want some info as well in your case, and can understand how frustrating it is for you at the moment.
The situation is the same in many countries, not just Thailand. You can't get into most of the EU from outside as well if you are not a national of one of the EU countries.
Since they are now allowing married and working visa holders to come back, i suspect the next step will include the retirement extension holders. August or September seems like a reasonable time frame.
Still in Thailand myself , we (GF and myself) wanted to visit Europe in May but that has of course also been cancelled, she can't get in and i can't get out. It's just a very weird time at the moment. Good luck and see you soon in Thailand.