In a similar vein, I went with a Framework laptop. Expensive, but 100% modular and repairable, with an in-house secondhand marketplace. I have a gen 1, batch 2, and the thing is stunningly manufactured for a startup. Can’t say enough good things. Happy hunting!