Longer form post why I'm considering new hardware. Hopefully you can help...?
@kev the main issue you raise is the "point of failure" perspective.
It seems to me your dekstop is still pretty decent for the usage you describe and I'd keep it for another 1 or 1.5 year, then maybe re build it from scratch.
Usb3 absence is a major issue?
Laptopwise you're suffering and maybe you should focus on that for now, that is your most relevant relative point of failure.
Separate upgrade allow you to invest more € in different times, should this be an issue..
Fosstodon is an English speaking Mastodon instance that is open to anyone who is interested in technology; particularly free & open source software.