I'd go for the X1, and I see on FB that new X1s are being offered with discounts so there's probably a deal to be had