My life follows exactly your first two paragraphs (except for the working for Apple part).

And then Spotify started pulling albums randomly, probably due to rights reason (I'm an expat so like to listen to niche/indie music from my home country), so in the past year or two I've gone back to owning my music. It's much, much better.

I do use iTunes Match, which I find fantastic to be able to listen to any of my music on the go without having to sacrifice storage space.

The story is the same with Netflix, which I used to use exclusively, but their selection has been dwindling in the recent years and now I'm back to hoarding my favorite shows/movies on hard drives.