I did complain at the restaurant that placed a screen between them, pointing out that I slept with my wife every night. Sometimes a little common sense would be useful.
I hope you are right, particularly about the restrictive requirements, but I have my doubts. Thailand has been edging towards a demand for health insurance for some time. They may see an opportunity to bring it in as a basic requirement.
I cannot see the amnesty being extended in the current circumstances, but it will depend upon what the virus is doing. If there are serious fears of a 'second wave' then the neighbours are unlikely to open their borders and the Thai government may see a need to extend. Their alternative, I suppose, is to change the way that visa runs operate.