Certainly a lot to consider, my main concern with the 7D is the pixel packed sensor and noise, if it can match the D300 at iso 1600 (my last camera) then its worth it.
With so many pixels it will be great for cropping and the video is a bonus to me though not essential.
As I have had a break...