I agree with you on their laptops, but their upgrades as of late are lame. If I wanted to update my 3 year old Macbook pro the only new things I would be getting is the new trackpad and the new keybord. Everything else I have already. Not worth upgrading for.
BTW as far as the DRM goes, this claims its not true. http://www.imore.com/no-apple-not-adding-drm-songs-your-mac-you-already-own
I think that piece makes sense, BUT it still doesn't address the fact that when iCloud Music Library gets turned on, all the music in your iTunes Match are no longer accessible. As of now, I don't trust that the music will show up or that they won't DRM it ("because its a bug") according to nothing but imore. I hope they are correct, but right now... meh.... my 9 Art Pepper CDs, which were perfectly safe in iTunes Match and accessible whenever I wanted them, are now no longer accessible on my iPhone. And that, is a fail.