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.

We will see 1) in the longer term, some of the emerging technologies will eventually be successful, 2) in the short/medium term,existing energy sources being exploited more aggressively--note plans for new nuclear plants, continuing efforts with hybrid, electric and "cleaner diesel" just as  examples, 3) in the short term, more drilling for oil, note new drilling in the gulf, I believe between US and Cuba, financed by Russia, 4)also in the short term, previously unprofitable oil sites opened and producing, plus previous sources such as oil shale seem to be opening now, and 5) rising prices will both lower demand and move demand gradually away from oil,,,,and it would be nice if public policy supported that.  And probably a number of other factors i don't have a clue about.

There is no single "silver bullet" here, imho, but we'll get something from each of the above factors.

I don't know energy well enough to really invest in it, but Uranium mining stocks have done very well, such as Cameco and Pinetree Capitol, the former up eight fold in less than five years, and the latter up four fold this year.  I made some small investments in these and did well.  I'm letting those investments ride for a while, but watching somewhat carefully.  But I don't know the energy field well enough to to make any serious investments in it, so I can't really answer you.