Finally I decided to ditch my last one by choice this summer and got a Thinkpad X13 Yoga Gen 3 and I really love it. Battery life of at least ten hours for what I'm doing. Still great Linux support. It's not too much lighter than the X220T, but it's a whole lot thinner and that's important trying to shove a whole lot of stuff in one bag. Also: USB-C charging means I no longer have to carry around a big proprietary brick and cable. I can just use the same charger as my phone. That's also important when it comes to weight and space savings.
The reason I chose this model in particular is because like the X220T, it also has the digitizer pen garaged in the frame. Really hard to find laptops that met that, and USB C, and thin, and Thinkpad keyboard + mouse nub. In fact I think it's the only one.
If this (fingers crossed) lasts me a while, amortized I don't think the cost up front will be that much more than what I would've had to have spent upgrading and transferring parts between eBay franken-ThinkPads over the same time.