I believe that the amnesty was also intended to cover those unable to do the 90 day border bounce. If the Amnesty legislation did not specifically state 'tourists' or the intention to give them time to leave then it is a cover-all and those remaining under its umbrella should not experience any difficulties on July 31st provided they then do as the Thai government requires.
I fell under the amnesty 2 weeks ago. I could extend using the married man option but the hoops you have to jump through are too excessive. I am hoping to go for a retirement extension next month when I can meet the requirements. Under another post above, one commentator is saying that those on overstay have lost their visas and have to start again. I do not believe that that is true. I hope it is not.
Be fair. They are, at least, thinking about what they are doing. This only hit 3 months ago. Sorting it all out will take time. Frustrating as that is.