Diesel cars are rubbish to drive (especially if your journey doesn't start and end at 70mph on the motorway, but actually involves towns at any point), and are driven by people who hate driving. I would never willingly go back to a diesel, and even the best petrol isn't even in the same league when it comes to driving experience.
My plan right now is to buy a used Model S as soon as some of my assets liquidate, then maybe trade it in for a new Model 3 next year.