I hope I'm wrong on this, but even though US oil demand is back in 1990s levels (mainly due to the economy being stagnant for so long), prices have only to go up. The Saudi royalty can easily play the US against China and set what prices they choose.
Already the new people in congress have all but promised to de-fund solar and battery research and push the Keystone XL pipeline.
I agree with you that the oil ecosystem wants the oil age to be extended as long as possible... but unfortunately, they are the ones in power, and even with solar, no amount of PV panels is going to get a car across the country.
