I've started looking at the Frameworks....
https://frame.work/laptop13
Seems to be the most DIY friendly laptop. Including a full on "Bring your own OS, storage, memory, whatever" model. Drawback, the build out I want buying the drive, memory from them will be around $2600. And won't ship...