downloading my music librabry on my iphone

Hi, I have a 80GB music library that I have on my MacBook Pro and on my iPhone. Ever since I subscribed to Apple music, my music library can still be found on my iPhone, but it is no longer downloaded so I can listen to it offline. These are all my CDs that I spent months burning down and that I always want to keep in my Mac and my phone. The only answer I find is that I need to tap on each song and tap download, which will take months... the other is to switch on automatic download, but that doesn't do anything, it doesn't download my library to the phone. I tried to not sync music between devices and when I connect my iPhone to my Mac, I tell my Mac to upload my music library to my iPhone, but that doesn't work anymore, maybe because I have an Apple music subscription. Basically, ever since I added Apple Music subscription it has messed up my library. Is the answer to not use Apple Music subscription and go back to what I use to have and have another service like Spotify that doesn't interfere with my music library on Apple Music? Would love to have some support on this. Thank you.