Sorry to barrage you with self-links, but I felt the same thing recently and I've started working on an (open-source) tool for addressing exactly that: organizing my music collection correctly and painlessly (i.e., as automatically as possible).

It's called beets and the idea is this: just throw new albums at it; they get tagged correctly (from MusicBrainz), copied into a directory structure you specify, and catalogged in an sqlite database. Let me know what you think: http://beets.radbox.org/