iTunes Match vs Apple Music

So, I finally decided to join a cloud-based music service, moving from a local-only library, for convenience.

Most of my library is old rips that would not be in the store, where I sometimes add new files locally, and also a fraction of it is iTunes purchases. I plan to be making both iTunes purchases and adding local files to it going forward.

Considering the above, it looks like Match is a better choice?

Would I be able to continue syncing/purchasing/saving iTunes purchases (non-Match) alongside the iCloud Music library with all the Match stuff?

Thanks