Don't be certain of getting in on the free entry. I got my 60 days, left for a two week trip outside Thailand and on exiting was told by the IO that I would need a visa if I intended to return.
He said he would put a note on the system, so I did indeed re enter with a visa.