How to put music not downloaded from iTunes or Apple Music onto iPhone iOS10?

Hi, so I have always manually managed my music and have lots of music from my own CDs and from other various sources other than iTunes and Apple Music. I use Apple Music and I could download and play that music offline no problem, but when I updated to iOS 10 it got rid of any music on my phone that was not from Apple Music or iTunes (about 1500 songs) and when I try to put them back on my phone from my Macbook, it says that I can't do that because iCloud Music Library is enabled on my iPhone. If I turn iCloud Music Library off on my iPhone however, it will delete all the music I have downloaded from Apple Music from my iPhone. If I want my old music back as well as to keep Apple Music on my phone, what can I do? Thank you so much.

Katie