Packing for China

What would you bring on a trip to Beijing?

With just two weeks until I'm off to China m thoughts are turning to what I want to bring with me. Mainly what photographic equipment I want to take.We're planning on spending most of our time in Beijing with a trip out to see the terracotta warriors. Here's what I have:

> Canon 30D
> 430EX Speedlite (flash)
> 17-40mm f/4 lens
> 70-200mm f/4 lens
> 100mm f/2.8 macro lens
> 300mm f/2.8 lens
> 1.4x TeleConverter
> Tripod

For Jeju I took along the body, flash, 17-40, 70-200, TC and tripod. I hardly got any use out of the TC, the tripod got more use than expected and the flash only got used one evening but it helped then.
At the moment I'm thinking: 30D, 17-40 and 70-200 for sure. I'll also be bringing my laptop to download and review images.
What I'm not sure about is the flash and/or tripod. I don't know how much use the flash will get. Bringing it means bringing a bunch of AA batteries and diffuser, but that's not much of a hassle. The tripod would be handy to have, especially for landscapes and touristy self-portraits of Courtney and myself :) The downside is that its a bulky piece of kit.
This trip isn't a primarily photographic one. I'm going there to experience China and spend some quality time with Courtney. That means setting up and packing down a tripod could get in the way of enjoying the trip. I'm sure Court won't object with my photographing however, I just don't want to. However I really enjoy taking pictures (see earlier post).
After having a night to think about it and talking to Court I don't think I'll be taking the tripod as it has the possibility to limit mobility and that's important for us. I will however be packing the flash. After recently subscribing to the Strobist blog I am thinking about ways to get my flash off camera and also maybe getting a 580ex flash so I can turn my 430ex into a slave. Hmmm, more stuff :)