Laptop upgrades are on the way. My current one draws too much power to charge on an airplane and is physically falling apart so I've picked out a new machine that's easy for me to upgrade myself. I can get higher spec parts than the manufacturer offers in RAM and SSD for half the price as if I let them pre-install to the same capacities.
End result will be something with more RAM, more storage, similar performance (maybe a little better for some of my uses, maybe a little worse for others), but much lower power consumption so it should be nicer as a travel machine.