my immigration told me that 30 day exempt is fine but have to extend by another 30 days (1900 bht) to allow time to do the Non O. 6O tourist visa is easier.
The reason they are doing this is because there has been no response from the Thai government to there request about the status of the Amnesty. The UK and Australia the same.