I've given up with that, I have 3 or more computers at any time, I don't have a NAS. My MP3 collection is now 10 years old, I have MP3s I've bought littered all over different computers and online services and hard drives. Streaming is just easy when it works. I can do it in my car, at a friends house, on top of a mountain. Remastered albums can be annoying, because of the extra tracks which you don't really care about or a different sound spoiling the experience. Often there are multiple versions available on Spotify/Apple so you can find what you want if you take the time.