not sure of the nikon stuff, but i would look into the 7D as well.
you will also need glass when you upgrade to the DSLR.
are you getting this for mostly still shots, video, or both?
i have heard if you use it mainly for video, the t2i is worth the $700 discount over the 7D. but i heard the stills and iso/exp stuff is better geared for stills on the 7D.
just 2 more cameras in canon's linup that may be worth checking out