I'm using Qobuz now, they have both downloads and streaming, and apparently pay the artist more than any of the other streaming alternatives. I've found all the music I've looked for there too (including some artists that dropped Spotify). Quite happy with everything except maybe the name ..