Based on your requirements and the change in your environment needs I'm not sure why you're considering a MBP - at least not until the next iteration potentially addresses the keyboard issue and comes with a spec bump. Seems like the X1 would be a far superior fit in this specific context.