60D or 7D? that is the question.

I recently broke my beloved 40D. I found out that 3 1/2 years ago, I had purchased Accidental protection plan from Best Buy at the time of Purchase. So, once i realized that I have time left on it, took it to Bestbuy storer. They sent it for repair. But, they are going to have to replace it. So, the question is, which camera to replace it with?

I may have to make a choice between 60d and 7D. They match it by features not price. If that is the case, in my opinion, 40d is much more closer to 7D in features. And, I believe that the choice will come down to what I want.

So, If you were in my situation, which one would you choose and why?

and, if the answer is 7D, how would i convince BestBuy that my 40D is closer to features with 7D and not 60D.

Thank you for your help

Shyam