Why does it chuck a spanner in the works? If you took the Golf GTE, with its "28 mile" range, its using 2014 lithium battery technology, and you put todays cutting edge battery technology into it you would get almost "50 miles" never mind waiting a few more years. I think a lot of people don't realise how quickly things are going to change over the next 20 years. Take a Tesla Model 3 and apply 10-20 years of technology improvements and cost reductions, no one other than real enthusiasts are going to be buying combustion cars anymore.
Think about combustion cars as steam engines, the rate of change once people figure out the cost of ownership will be rapid...