Exactly this. Google Play Music was great because you could host your collection with them and mix it with their streaming library fairly seamlessly.
Since the announcement of GPM's demise I haven't found a single other platform that fills this niche.