I just bought a model X, zero regrets.
If you can wait 1-2 years... then sure I guess, wait.
But I wouldn't and I didnt. Sure it's slightly better then the current model, but that's life in tech.
A candy that is 5% bigger then a normal one is technically better, but your not going to regret...