Currently I have a 2013 Macbook Air, which I'm happy with everything about except for a) the keyboard, which I find too shallow and harsh for extended typing, a

Currently I have a 2013 Macbook Air, which I'm happy with everything about except for a) the keyboard, which I find too shallow and harsh for extended typing, and b) Office for Mac, which is a terrible substitute for the real thing. I'd be interested in getting this or the new Thinkpad Yoga, does anyone know how the keyboards compare? Obviously with the new models the keyboards may be improved compared to last gen but how good can a keyboard on an ultra-thin like the X1 be?