Model Y will likely be my next car, but my Model 3 still has new car smell so that won't be any time soon! Definitely not until well after the Model Y has started shipping (and I'd want 7 seats which isn't until 2021 anyway).
Overall I like my Model 3 more than my old S, but I miss the hatchback...