I'm using MusicBrainz Picard. However there are some tricks to spare you some nerves:

• you can set weights to release types in the settings. Singles and compilations should have a lesser weight than albums.
• Don't add too much music at once. Or you'll get crazy selecting the correct releases. I usually go with one artist a time. Especially for older artists I just add one album a time. You can enable the file Browser in the view settings, than you can just drop them in one after the other.
• in the right pane you can just drag and drop whole releases to merge them together.
• Also noticable is the rename feature in the settings. It's just awesome!