iTunes Match + manually managed music?
Note that iTunes Match is fairly precise in how it matches songs.  A unique recording will probably be uploaded, not matched -- certainly, if the unique recording has a different length than the standard ones, it won't be matched.  If you are willing to potentially lose $25, get iTunes Match and see what is matched.  If stuff that you want to be uploaded is matched instead, don't use iTunes Match.