Retirement extension at Chaengwattana…new TM30 confusion

Hi, hope someone can help on this…
I am due to apply for a one year extension to my retirement visa at Chaengwattana. I did this last year and at that time Bangkok did not require a TM30, but I hear this may have changed.
I am staying in a good quality but small serviced apartment block andthey do not do file a TM30 (I know theyshould,It would be nice if they did…but they dont)which was no problem last year as no checks were made. I usually stay in Thailand for a couple of months at a time, never as long as 90 days so never need a 90 day report.
This year I am wondering whether to just go to Chaengwattana andhope they dont check or be prepared to have to queue ata new TM30 desk, pay a fine and receive the needed paperwork, assuming they will do this without proof of address as I do not have acontract. I dont mind the fine, this is Thailand after all,but I dont want to have to wait in a long queue.
Or would it be better to checkin to a hotel the night before and usethat as my address, as they should file a TM30 if its agood, largish hotel. But even then will Ineed some kind of TM30 receipt for which I will still have to wait in a long queue to obtain and maybe still pay a fine?
Or the third option might be to finally stop bothering with Thailand because this nonsense is really getting to be too much.
Thank You