Longer form post why I'm considering new hardware. Hopefully you can help...?
@kev Based on your use/needs, I'd upgrade both systems. Grab a decent/lower power laptop like a Pinebook. Since you're not gaming, you can forgo the cost of an expensive GPU, and focus on more of a "workstation" setup. You can get some amazing deals on older dual Intel Xeon motherboards and CPUs that would last you a long time. Maybe a Supermicro board, dual x5675 processors (which would yield 12 cores/24 threads) and a mountain of DDR3 ECC ram.
@kev Pro level move 😉
I can help you source stuff if it's the path you decide to take. 😋
I was idly pricing out a beefier server to potentially replace my Pi. But that sounds cheaper and faster.
Fosstodon is an English speaking Mastodon instance that is open to anyone who is interested in technology; particularly free & open source software.