I have iTunes Match a shot - it was ok but it didn't get all of my music fixed and it didn't change any of the fundamental issues I have with the whole workflow.

Find artist Download/buy albums Listen to songs, rate, put in playlists Sync to devices (this it solved)