I agree with most of what you recommend, except that I am in favor of higher taxes on gasoline and oil (offest by reduced taxes on other things, e.g., income). This will skew the development of infrastructure away from oil, and thus reduce demand and price. The reason for the short- to mid-term inelascity of demand for oil is the existence of some 1 billion internal combustion engines worldwide that run on oil.
Thanks for looking.