i know the feel. My favorite tool on windows: http://www.xdlab.ru/en/ and Mac: http://www.entwicklungsfreu.de/tagr.html. Wish the former was also available on Mac, definitely the best I've ever used.
I'd highly recommend Tagr for organizing your music. Not only does it clean up all of your files in iTunes but it also helps organize everything in finder/explorer as well. It lets you add info to all of your audio and rename the files and I find it to be much more reliable than right clicking a song or album and editing the info from iTunes.