Note my five suggestions have three on the demand side, and two on the supply side.  It's just not rationale to eliminate half the options.  Certainly increasing the supply of oil helps the situation--I'm not saying that it solves the situation, only that it helps.  And the new technologies that are being developed will have the effect of shifting the supply curve.

Historically cheap oil has made it impractical, in a capitalist society, for the investments in new technologies to be made that will shift the supply curves.  This is an area where visionary public policy could have seen the situation, and made policy decisions that would have smoothed the transition.  Obviously that didn't happen, and the road to change is going to be bumpier than it might have been.  But what's new with politicians that either lack vision, or lack courage because often vision requires short term pain--anathema to politicians--(see social security and healthcare for the aging).

It's peak oil supply. Peak oil demand is nothing to worry about. If prices stay reasonable, demand is almost infinite.

Peak oil is not an energy crisis. It is a liquid fuel crisis.