I would say try the Model S and Model 3 now.. See if you find someone with a grey import Model Y (I've seen many in Poland and Germany) and have some test drives.
I have a 2014 P85 and I love it. The air suspension alone is worth it when traversing city streets and doing the on-sidewalk...