Hydrogen is the better battery.
Speaking as someone who has had to deal with hydrogen in refinery process:
No, it is not.
Getting hydrogen to a usable form for transportation involves energy losses in the neighborhood of 50% or even more.