I am going to Tokyo soon and will take the 10-24, 23mm F2 and 55-200. However I think that this is still a heavy kit to take traveling and ideally I would take the following kit, not all of which I own:-
10-24mm, 35mm F2 and the Minolta Rocker-M 90mm F4 with the Fuji M adapter. This to me is a great travel kit. The 10-24 is the only zoom I would need, the 35F2 is a great standard lens and the Minolta CLE 90mm F4 whilst fully manual is astonishlingy sharp, light and compact.
Sadly I sold me 90mm F4 and a full set of filters when I sold my CLE (What a mistake!), I will replace it.