Thank you for all your advice!
After digesting just about every Thinkpad T and X model I think I'm going to settle for a T440p as my main work machine and a X220/X230 (with keyboard swap) as an ultra portable. Just waiting for the right deals on used thinkpads in my country.