If I were you - and I wish I were because that sounds like a great trip! - I'd bring the 35mm F1.8 as my all round lens. Bringing the 50mm as well is not (strictly) necessary, I think.
Of course, I'm thinking in terms of encumbrance and weight here...less is more.
The 35mm is great for street, buildings, low-light and portraits!
So the question for me would be, should I go WIIIDE or LOONG for my second lens?
I like the Tokinas, but the wide ones are baaaad for flares...sunflares especially. And they are particularly obnoxious..long, red and hard to close out! Excellent for indoors and architecture, but don't get the sun on the frame.
Call me crazy, but I'd be tempted to bring the 10.5mm fish eye. The fisheye-hemi software does a great job of straightening the images out and you can't get a sun flare if you want to..lol.
Not sure what I'd use a longer lens for, bu to be on the safe side, the 55-200 AF-S VR is inexpensive, lightweight and does really well in good light.
Good luck with your choice and your trip!!