Upload & Sell: Off
No question, bring a WA, 24-105 or even better the 17-40. Cities like HK and Taipei almost demand 17mm on FF. For landscape the 17-40 is a decent performer stopped down a bit. As I learned in Seoul last year, Asian cities are bright at night, I brought a wide prime on that trip, but my F4 zoom worked just fine because of all the lighting was giving me such fast shutter speeds.
I am going to Tokyo in a couple of weeks and am bringing the 25-105L and the Tokina 16-28. I don't shoot longer than 105 much when I travel to urban places, always seem to want wider, though.