Replacing Google Music

I've been using Google Music for years...I spent about a week while in Glenrosa ripping and uploading all my CD's across about 4 PC's, having all the CD drives whirring full-time, and I have/had a gloriously curated ~6,000 song/50Gb library of music. I've made a lot of use of the hybrid downloaded/streamed data model on my phone (I spend a fair bit of time out of network connectivity...be it holidays or cycling in the middle of nowhere).