John,
Since you use Canon, you might look at Digital Photo Professional and ZoomBrowserEX. I met with a rep from Canon and their RAW converter is meant to work with the camera specifically and the adjustments that you can make to your RAW images are just as if you were adjusting your camera. It is an amazing program. Lots of the pros are using them if they shoot Canon.