Lease in this particular case is unique in terms of what it affords you.
You have secured the car of your dreams for 2 years, at very modest premium ($600 or so). You DONT have to buy out the lease now, you can wait the entire 2Y, for $30 extra a month.
Unlike those that are holding for fix, in your case there's no risk. A nasty failure could nick the fixers for serious $$$$. You dont have that problem, everything is covered.
If in the meantime, say spring '19, VW or other company brings an uber-super-duper diesel to US shores, and your car is worth much more than the purchase price, you'd buy it and use it as trade-in etc. If the value instead, has plummeted, you walk away from the lease w nothing to loose.
There ARE some truly dedicated folx here that wont sleep well till they have the title