I think we should wait another 30 years, declare we're "addicted to oil", and then repeat the cycle.
Part of the problem is that if we seriously look like we're going to kick the habit, the Sauds and the Iranians will glut the market. The Saudis are already trying to make the switch so they can export gasoline directly. If Iran wasn't being run by a bunch of inbred idiots they would be doing the same instead of chasing the atom and rattling their 7th century scimitar.