Check out Framework if you haven't already! https://frame.work/linux

They're designed to be upgraded and repaired over time so they're super modular. You can also save some money if you're not afraid to put it together yourself.