I would check out the X1 Carbon in person before making that decision. The display is terrible. It's the only device over ever used that's given me significant headaches after even moderate use.
Sorry for throwaway.. long time lurker, just posts seldom.