I hope so too. I’ve either built or modified every PC I’ve ever owned. I think if desktops do endure it will (perversely) be because of the PC gaming and its sadomasochistist relationship with Windows. (For example Windows OS’s always seem to require just a touch more than a given machine has to give, leaving gamers the single option of hardware upgrades.) So there may be reason to hope.
In fact, I think desktops have a better shot than CDs. Certainly in my part of the world–Toronto Canada–record shops have gone extinct. One owner I got to know over the years–in a dark moment–told me he thinks that in the near future music would be purely digital and available as files only. And while he continues enjoying the boom in vinyl sales he worries that vinyl too will fade. He claims it’s only a matter of time before hipsters figure out what a pain in the butt vinyl is.
In sum I think what might kill desktops is that currently most new PC users come from smart phone users and so have minimal expectations of or exposure to the vast capabilities of modern computer systems. Smart phones and social media seem to have created a particularly distracted and peevish pool of potential PC users with blurry expectations.