Interesting analysis! It is true that hydrogen has the advantage in energy density per mass but the challenge of storing it is still a major obstacle.