iTunes Match to Apple Music

I’ve read through other posts and still aren’t sure. I need some more clarification. Looking to combine my Apple subscriptions into Apple one. A couple things are holding me back. First I have iTunes Match and enjoy making a playlist on my laptop with the music app and listening on my iPhone or AppleTV. Last I tried Apple Music trial subscription I wasn’t able to add cds to the library only access the library Apple has in their server. Is Apple Music more like iTunes Match now and is it possible to lose my library cancelling Match and going to Apple Music? The other thing somehow a I have subscriptions under two email addresses. Is there a way to combine them both in Apple One? The majority is under one email but my iCloud+ is under my .me account.