If you take the city tour, do you know if you actually pass through immigration prior to boarding the bus?
I was somehow under the impression that this wasn't the case--that you were sort of chaperoned around, without any opportunity to get off the bus; rather a sterile, sanitized tour. As someone mentioned earlier, if there's a chance to get off the bus for a bit & then grab then next one back to the airport, that sounds quite interesting...