I switched to Deezer on a whim like 2 or 3 years ago and never went back. It has its own baggage, but little annoyances like the shuffle thing don’t happen anymore.