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 Mobile Supercomputers
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)