<p>You might look at Applied Physics programs. Stanford has a very good one. A lot of physicists work on energy related research and they typically are more toward the materials science side. </p>
<p>As for engineering disciplines that would fit, Materials Science and Engineering and Chemical Engineering are probably involved more in the energy field than Mechanical Engineering.</p>