Instead of using Photoshop, why not give Apple's Aperture a try? Aperture is designed more for post-production work for professional photographers, letting you cull through shoots, enhance images, manage massive libraries, and deliver stunning photos.
Watch this video tutorial on how to manage your photo library in Aperture. As a serious photographer, you understand the need to keep your images organized. In Aperture, you can organize your photo library in any way that suits your working style. Manage your library with projects, albums, folders and smart albums.