In part out of frustration with Spotify, and in part to hedge against streaming disappearing one day, I'm in the process of ripping my exiting CD collection to FLAC, and buying either digital or physical copies of my favourite albums.
I've found it pretty refreshing to open my music app (Finamp) and only see exactly what I want to.