I’m in the same boat. I own used x230 and a used T460 both souped up with more memory and SSDs. I just picked up a used T480 with an i7 and 2560 display. Will soup it up with more RAM and another SSD and should be good to go for a few years at least.