Well, not so fast. I'll take you at your word that the industry is moving away from upgrades. But let's consider this a bit more closely, starting with laptops:
1) Most computer buyers are purchasing low-end laptops, so when one sees the industry moving away from upgrades, it's probably reflecting changes in that sector, as it's by far the largest. But you can't use the preferences of buyers in that segment to assess the preferences of, say, MacBook Pro buyers, since they are a much more specialized clientele. I.e., the very niche you're saying does care about upgrades may in fact include a large portion of higher-end Apple customers.
2) I'd characterize the 14"/16" MBP's as high-end mobile workstations. So if we want to see if the PC industry is doing the same thing as Apple, we need to see if high-end PC mobile workstations are also moving away from upgradeable RAM and storage. In doing a quick check, I don't think they are (e.g., Dell Precision 5570 Workstation). Some higher-end thin-and-lights have abandoned upgradable RAM, but those seem to be more in the category of the Air (and even those still have upgradeable storage).