Give it a bit of time, this unlimited border entries won't last, the ETA system now is the start, IO's prefer to see visa's if one is entering often. In my case years ago working a 28/28 on/off rotation outside Thailand, after pages and pages of exempt 30 day entries, an officer said "you spend a lot of time here you need a Non O" so I got one rather than push it further.....