I don't think batteries are a long term solution without a materials science breakthrough. The charging rate and the charge density needs to be increased exponentially.

I think we have a much better shot with hydrogen fuel cells, or other phase change system that can be refueled rapidly.