time for a change

just as i was celebrating the release of nikon d700, and saving money, canon comes up with 5D mark II, and blows me away. twice d700, and costs less.
shopping cart:

• Canon 5d mk II
• Canon EF 100mm f/2.8 USM Macro
• Canon EF 70-200mm f4.0L IS USM
• Canon EF 16-35mm f/2.8 L II USM
• Canon EF 100-400mm f/4.5-5.6 L IS USM

update: i specified 16-35 strictly for uses on architecture and interior, thinking it may have less distortion than 17-40 f/4. looking at some of the reviews, i am not so sure anymore. the price difference is huge, i don't care for speed, and 17-40 distortion is not much worse than 16-35.