Why not get something used? Thinkpad, Dell, etc.

Are you sure Clevo is out?

How about something like entroware.com, system76 etc.?

I heard something about a truly modular laptop very recently on a podcast; either LateNightLinux or BadVoltage. Not sure, but I think it was this: https://frame.work/
It saddens me that this is "big news" - I somehow still live in that old world where what you ask for is the norm...