On the other hand if I had the 7D before hand I'm not sure it would really be worth swapping, depends on how much you think you will benefit though. The AA was one of the reasons I veered towards the D7000.
Ah, you didn't mention BoP before, although you currently don't appear to have a long lens for it(?). The longer affordable end is where Nikon lose out IMO, they lack some affordable options, like a VR version of the 300 f/4, no equivalent to the 400 f/4.6 and have only just released a 70-200 VR (which filled that hole, mostly at least). There is also nothing like the 70-300L (although the 70-300 VR is ok...ish). Depends what lens you want though as Sigma and Tamron still do the same range on both.
The 100mm macro is easy enough to get and there are plenty of options to replace the 17-40. You will struggle with something to replace the 70-200L though (assuming it's an f/4), the 70-200 VR isn't out yet and will come in at over £1k i'm assuming, with no chance of buying used, not quite the same as £350 for the non IS 70-200 f/4.