As mentioned in the video I linked, I've got an extended warranty for my X1 Carbon, so I will just hold out and see what happens. Maybe I'll buy a couple of T420s's (the last of the T line with the proper keyboard) and make them run for another 5 or 6 years after that. I definitely don't need the latest hardware, given the sort of dev I'm doing on my laptop.