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.