OP, your immigration office is wrong.
By any chance CM?
You do not need to make a new TM30 upon reentry to Thailand
Explained in the OP in this thread
https://aseannow.com/topic/1169664-thai-immigration-announce-changes-to-tm30-reporting/
In particular this part of 2.2....
The alien as defined in paragraph one shall include those who
being granted multiple-visa who leaves and returns to the Kingdom with specified
time in the visa, and those with re-entry permit.