, I might be wrong but if you stay in Hotel, you don't need to do TM30 by yourself.
I know there are some problem with landlords and private residence , but hotels has been done this all the time according to law .
"According to section 38 of the 1979 immigration act, “House owners, heads of household, landlords or managers of hotels who accommodate foreign nationals on a temporary basis who stay in the kingdom legally, must notify the local immigration authorities within 24 hours from the time of arrival of the foreign national."
I was in CW for same thing yesterday, Had my "khor lor 2" from 3 years ago (No update) , No question asked! they didn't even looked at any other original docs! the lady said, No need to waste time, it is covid time!!
the process was less than 10 min, but I waited in queue for 2 hours (dropped in, had no appointment).