Youtube Music (Google Music successor) is shaping up really well. It was buggy for a while (and in fact that exact bug of clicking on a song and a different song playing was on youtube music), but either I've got major Stockholm Syndrome or it's gotten really polished.

All that said though, G killed the public API for music which is a horrible tragedy to me. I may yet still go back to spotify just for the API.