Yeah, I'm in the same boat. I'm thinking of putting my music in my Google Drive and using Plex (on a seedbox server). So my music is safe and accessible but I still need to pay for a streaming service because I like the discovery options they have.
I made the switch to plex because of the end of google music. You can get a tidal subscription through plex which has worked ok. It still separates your libraries, but you can create combined playlists.
