Have you considered Framework? They're laptops are almost completely modular. The problem with laptops is that they don't have a dedicated GPU yet. But they're otherwise interesting.