Shell out for the 5 year next business day onsite warranty. You get an entirely different tier of phone support and the onsite folks are the same ones who come to take care of my Lenovo stuff. Did this with my XPS 13 (9343, early 2015) and they have been wonderful. Had an issue with the space bar double-clutching and they showed up at my office the next morning with an immediate fix.
It's been a great machine.