I finally dumped Groove music for Amazon music. I couldn’t take the Android client anymore and the pace at which things got updated was glacial.
I tried using the “Stamp” app Paul mentioned a while ago, but it matched the right song on the wrong album. It probably doesn’t matter much – the song is the song regardless of the album – but I didn’t care for my music being “rearranged”.
I had to buy the Amazon music storage because of their ridiculous 250 song limit to upload, but so far I’m happy with the Amazon Music client on Android and Windows.