@Zaphon:
So while I would love to upgrade both, and I'm looking for options on my home hardware. But to be honest, in today's world where we're more worried about power consumption/etc. the older hardware runs circles around it sadly.
No, newer hardware is both faster and more power efficient. (Comparing like-to-like; don't compare a goldmont tablet cpu to a server cpu from 8 years ago, compare a current server cpu to an old server cpu or a modern goldmont to something like an atom 330.)