Apple Music on PC

For a few years now, I've had a balanced ecosystem between my PC, Mac, iPhone and AppleTV. I subscribe to iTunes Match, and I used to be able to buy things from iTunes Store, rip CDs and digitise vinyl, and the items would all upload and synchronise to become available on all devices. I recently went to rip a CD of material from local bands that was only available promotionally - it was many years old, and I was researching a piece following up my music students. The CD ripping, I do on the PC, but iTunes no longer showed my library, it showed only audio books and podcasts. I realised Apple Music had finally made its way to the PC, so I installed that, but not only does it not have a CD import feature anymore, it has uploaded all my audio books and podcasts into my iCloud library along with a second copy of every single thing in my library. It's taken days and days to get even part way through this, and it's going to take me years (literally) to sort everything out, back to how it was.

I mean, I'm happy for suggestions, I just wanted to blow off steam on an Apple Community Forum about this... How appalling this piece of software is... from Apple... where everything "just works".