I understand the situation can be a bit tricky, especially with the TM30 requirement. Staying at a hotel for a day before your visa extension could potentially work. It's essential to ensure that the hotel files your TM30 correctly, just like you mentioned during your previous stay.