As MarkBC says, the new versions of Lightroom are pretty much all you need. PhotoShop is great for more advanced processing and printing but LR can do most quite well. As I watch a friend and his similar struggles at the moment, I might suggest figuring out your in camera JPEG processing...