I think you've actually asked two questions. One about organizing and one about storage. The storage issue has been well answered.
Abut organizing --- what do you use for editing? I'm a lightweight and use PSE 10. It give me all the organizing capabilities I need. I suspect others do as well.It's so easy to have files in (multiple) folders and with the keyword tags you can get to anything you want right now.