I have the 7d, I also upgraded from the xti.... One thing I suggest for you is to try out the 7d at a store or even borrow it for a week or so because focusing is not just pointing and shooting on the 7d. Focusing takes some practice and some people don't like it.
I like it tho, it's an awesome camera. Either camera is a good buy, just depends what kind of shoot you do most.