Just for the record then, I did just redo my complete set-up and stepped up a bit from my 350D and accessories. I already have a 580EX and 430EX, plus a 50mm f1.4, so they just move over. The little pile above consists of:
Canon 5D MkII body
70-200mm IS f2.8L
100mm f2.8 macro
UV filters for all lenses
I also ended up buying another Lowepro bag to carry everything back as hand luggage (boxes went in the checked in luggage)
As to prices, I'll have to dig around and see if I kept hold of all the bits of paper they were listed on - I know the receipt only has the total on it. It did come out a bit cheaper than I'd pay in the UK, but it wasn't a massive saving - certainly not by the time the credit card had had it's chunk.
The only thing I didn't get was the remote cable release and the one from the 350D has a different fitting, but that shouldn't be a major thing to sort out. Guess you'll be wanting to see some pictures next...