P.S. Tried a 7D and it had most of the above but I found the images were softer than on my (wife's) 40D so I decided to wait
Just want to ask one obvious question here... Are you using the same lens on both cameras? I am sure this is an obvious "Yes" but still had to check
I also use Lightroom for all my post processing and I actually get better results from it than with Photoshop's RAW utility. I think the basic "engine" of the 2 apps are the same, but I find I have more control in Lightroom. I also use Nik Sharpener Pro, but find this can sometimes go a bit overboard on the sharpening.
Unfortunately I don't have a 7D, but I do have a 40D and this used to be a bit soft for me compared to the 1D. I set the sharpness to full on the presets and violla - never looked back. If it is too sharp, which it hardly ever is, I just pull it down a bit in Lightroom. It is much easier to "soften" one or two photos in Lightroom than sharpening a whole bunch.