Hi Bruce,
I think you've pretty much got all the bases covered with the above. A lot of photographers now swear by Lightroom and insist it's all they need. As I'm a CS5 user I can't comment really on the above but I think either of them (or both) come packaged with ACR, so you're good to go with raw files as well.
I did have a (very) little trial with LR whilst on holiday recently and couldn't really get into the feel of it. But as I said above, I'm a diehard PS and Bridge user so I'm biased towards that.
![Smile](https://cdn.cambridgeincolour.com/forums/images/smilies2/smile.png)