I switched to OnePlus - battery is replaceable (with some level of difficulty) and they update the OS versions for years and years - there's so much great Samsung hardware out there running dangerously outdated software. It's a pity that many svelte laptops are so hard to keep working - I like Eurocoms:
EUROCOM Fully configurable and upgradeable Desktop Replacement Notebooks, mobile workstations, mobile servers and Portable LCD PC systems. Our products are engineered for quality, performance, long-term stability and serviceability. Eurocom Corporation is based on the philosophy that the...
eurocom.com
...and upgraded old Lenovos (to FHD, older trackspads. Their (older) keyboards and build quality is still the best. There's even a group of geeks crowdfunding new motherboards for them)