Well a last update.
The immigration officer at S airport let me into TH based on an expired PR (date just before the covid waiver came into effect) however next day at CW : PR was canceled, there is no fast route to re-apply as I am not working and staying in TH, they took all books back and made me sign a document that PR is canceled and that I had handed books in. As I did get a Thai Tourist Visa abroad, they told me to go back to the airport, after they looked up the officer who CW said should have refused entry on the expired PR. CW contacted the officer and gave me her mobile nr. So I went back to the airport and the officer at the airport changed entry in my passporr to a Tourist Visa.
Ending 15 years of PR.
So PR's are not for life....
If you are in TH, married to a Thai and working here: skip the PR and go for a Thai Passport.