Most of my music came from CDs as well but luckily had a net connection to update my database with the CD info. I've slowly re-added some albums over time to get rid of those pesky "Track 1" songs, basically rebuilding. I sorted my library by "date added" to make it easier. Match worked great... at first. After about a month it tanked, unable to connect to the iTunes store and updating my library across my devices. There are quite a few threads about this since the problem began. It began to work again after a couple weeks, but not 100%, still occasionally losing connection with the iTune Store. I ended up turning it off after I was able to connect and download all my music back to my laptop. I called Apple and they said my database only had around 400 songs, which was incorrect because I had well over 1500 I'd uploaded to Match. If I turned off Match then I'd have lost all that music. Here's one of the threads about our Match disaster.
https://discussions.apple.com/thread/5223301?start=0&tstart=0
Personally I wouldn't use it having had an awful experience (along with lots of other people). It wasn't an isolated problem and Apple never acknowledged it. I now make monthly backups to an external drive. Best of luck!