I think the changes that are coming are more complex. Firstly the motor industry are looking at the age of new car buyers and think that the next generation will not buy cars. They will lease, join car shares schemes, or use Uber,. This means cars do not need to appeal to private buyers. Tesla is already going this way, no annual model updates, very bland styling and they shifted 1,000,000 last year. EVs will be come white goods.
Look at new car ads and se if you can find a mass market car that advertises: how many cylinders, how many valves, where the cam is, what type of suspension it has, cost of s service.
Now look and see if you can find out how connected it is, facebook etc, how many speakers is has, how much it costs per month
Secondly there will be 2 really big spits - town vs country and 1st world vs rest. All our EV/hydrid debate is a town / 1st world issue. So far as I can tell no one knows how this will play out. The industry are working on the assumption that in a 1st world country all short journeys will be EV / electric bike / EV Uber / self driving (don't start me..) and all long ones by electric train. Once you stop owning cars this model works well. You drive your Tesla to the station, some one else drives it around your town, you pick one up where you are going and drive it to your meeting where it charges. Doesn't work in the countryside and it really won't help an African famer with his tractor.
We could be entering the "Post car ownership age", no driveways or garages, most living in flats, a car delivered (driverless?) on an app when you need it. Those of us who grew up, like our parents, wanting to own a car, will be seen as dinosaurs.
When these changes come I think they will come quickly, there will be a point when driving an ICE car in a city will be like drunk driving and it will simply stop.
Will city dwellers visit the countryside and be outraged to see "yokels" driving diesels? Will it become "fox hunting 2"? Will we visit Africa to look at farmers using diesel tractors and say to our grandchildren "can you believe we used to do that, how quaint?"
I don't think anyone has a clue, buckle up for bumpy ride!.
PS We have masses of oil, that's my industry, we have about 200 years at least. The industry expect to leave most of it behind. There is no reasonable way to burn the remaining oil and not create a huge climate problem. "Peak oil" will be peak acceptability not peak reserves. "The stone age did not end because they ran out of stone."
Well they were until Trump, when they started making the new I Phones in India instead. 
