1. Battery cost is falling and EVs will be as affordable as their gasoline counterparts in six years
2. It will take until 2030-2040 until the demand for oil starts contracting
It seems to me like you get to pick only one of these statements. Once EVs reach affordability parity with ICE autos my guess is that things will hit the steep part of an S-curve.