One thing that will help, though, is to build state owned refineries. We should stop subsidizing oil companies, especially while they're making record profits, and have them pay to use our refineries. They keep complaining that there's not enough refining capacity, so let's provide it. As part of the contract companies would be required to refine a certain amount of oil per week.
This suggestion won't solve the problem, but it will help to stabilize fuel costs, ensure a steady supply and, if surplus funds are generated (they almost definitely will be), that money can go to research renewable energy alternatives. Currently some of you gas dollars are going to lobby AGAINST renewable energy, thereby ensuring the problem continues.
