As you already have the EF-S 17-55, I would steer you towards the 7D. I was in the same position as you and the improvement in AF over the 40D is like night and day.
To be honest, the AF of my 40D was the one thing that let it down IMO and, whilst I was very tempted by the IQ of the 5D, I...