currently own Xti - deciding between 7D and 5D2

Hello all,

First time poster, long time reader of these forums. I currently own an Xti and although I have thoroughly enjoyed it I'm looking to upgrade. I've seen many of the reviews of both the 7D and 5D2 including strengths and weaknesses of each.

Would the Xti be enough to make up where the 5D2 is lacking? I'm going to get a FF in the future regardless but am currently leaning towards the 7D.

Hope that makes sense, thanks for any help!