It's probably good to give a bit more perspective. Two years from now you'd be getting a Chinese (Shanghai) or or German (Brandenburg) car. Both of those will have new technologies and new battery chemistry and design.
Both will have more range and less susceptibility to climate fluctuations as well as better climate control technologies. Skipping the details, if your plan is to get the car in more than two years time you'll have a better car than current production as well as possibly better pricing. Skipping Brexit issues, it seems highly probable that you daily experience will have at least 20% better range than will
@kwest2 and I with our 2018 vintage Model 3's.
In addition the Supercharger coverage will be even better then that is now and charging suppers will also be much faster than they are now.
As a Tesla driver since 2013 and experience with multiple iterations of Model S, Model X and Model 3 the one constant is that all of them improve rapidly with time, and even the older ones improve with software and, sometimes, hardware upgrades. You'll find that the Tesla experience is like no other car in that they really do have continuous improvement.