You might consider a free trial of Lightroom download and give it a whirl. It is not an image editing program in the same sense as Photoshop. Check it out at the Adobe site.

You are the third knowledgeable person who has told me about Lightroom - I guess I need to check it out on the Adobe site. A good friend, Glen Titus, has been using it since it came out and recommends it highly. If I remember correctly there is also a section of it that helps you organize and file images.