Think after y'r going south,
@Agnes **********
, there should be one of the more than 70 Immigration offices π in the neighbourhood (Google maps). And indeed, when you aleady have a TM30, it's a bit more safe to ask for the extension. You can do it right away over there because the 30 days will be added to your current days.