While the main feature of Apple Music is streaming from Apple's massive collection of music, Apple Music also matches your music library and uploads tracks that aren't in Apple's library. There is also a 25,000 track limit, as with iTunes Match, but Apple's Eddy Cue has said that this limit should be increased to 100,000 when iOS 9 is released. (It's not clear whether the increase will also affect iTunes Match, but it's likely that both services will get the boost.)
However, there is one essential difference between iTunes Match and Apple Music. While iTunes Match lets you download your music files and then play them anywhere, Apple Music adds DRM to your files. This means that if you rip a CD, and it's matched or uploaded to iCloud Music Library via Apple Music, and you download the files, say, on another Mac, you will only be able to play those files as long as your Apple Music subscription is active. If you delete your originals, or lose them, then you won't be able to access files without DRM. As such, it is essential that you keep backups of your original files if you use Apple Music.
If you have both an iTunes Match subscription ($25 per year) and an Apple Music membership ($10 per month), then you get files without DRM.
The problem is that Apple is not making a distinction between Apple Music files that you download for offline listening--this is a key feature of Apple Music--and files that belong to you, which are matched or uploaded. In addition, there seem to be bugs right now, causing many previous matched files to show as Apple Music files, and to contain DRM when downloaded, even for users with iTunes Match subscriptions.
Many users are seeing this problem with matched files showing as Apple Music files (with DRM), and this is presumably a bug that Apple will fix. But, for now, if you download any of these files, they will be locked with DRM, and you'll only be able to play them as long as you have an Apple Music subscription.
Which is best?
The main issue is the integrity of your iTunes library. If you already have an iTunes Match subscription, I'd recommend you keep it, whether you plan to subscribe to Apple Music or not. If you want to continue using iTunes Match as such, it is now part of iCloud Music Library. If you also want to use Apple Music, that, too, is part of iCloud Music Library.
If you don't use iTunes Match, and only want to pay for Apple Music, then be aware that your original music files will have DRM added to them if you re-download them. Make sure you have a reliable backup of your library, just in case.
Sign up for CIO Asia eNewsletters.