I'm in the same boat with Google Play Music and Youtube Music.

I switched to AIMP and have been gradually moving files over.