I need to go look up the internals of batteries, but the first option is interesting.<p>The second option is basically the flywheel suggestion, except with compressed gas instead of a spinning wheel.  At that point you require a second power system, and it's probably better to refill on gas/diesel and be done with it.