Download all music in Apple Music library (iOS 10)
This isn't a perfect solution but it kinda works. On the Mac make a smart playlist that matches everything in your library. 



Then on the iPhone, download that playlist for offline use.