I would go with the 7D. Right now you can get the body at Adorama for $1300 (check the link on CR). The 17-55 2.8 is also a nice choice for fast glass but for me personally, I would not spend $1K for a lens that I could only use on a crop sensor body unless you never plan on going FF. A nice alternative if you are not opposed to third party glass is the Sigma 17-50 2.8 which is about $400 less than the 17-55. Good luck with whatever you decide!