I'm in the same boat. I worry, though, that the move to streaming means that the days of controlling my own music library are numbered.
People are gonna want collections - be it physical or digital - because that's what humans are like. If the music industry ever switched to streaming only, there'd be a MASSIVE decline in the industry.