This is the way. If I care about watching something in the future, I buy the Blu-ray and rip it. I already have basically all the music I could ever want in mp3 format. Plex (or Jellyfin if you prefer that) provides a pleasant UI, and I don't need those services any more.