I'm on the same boat. My 3 month trial for Apple Music just ended and switched back to Spotify. Most of the time I don't want to bother to choose what I listen to and for that the discovery features in Spotify just seem to work.