@Gary ************
I would go to immigration. Even if you fall into the category that has amnesty, you will be checking all the time when you have to go. Also, my guess is that when amnesty is over, it will be very busy at immigration.
Sorry if amnesty is the wrong word, hope it is clear what I mean.