I think what you are trying to say is that "mass production" of Hydrogen is only feasable "today" by means of extracting if from hydrocarbon sources... and it is expensive and not very environmentally friendly... and I agree wholeheartedly. There are other methods of extracting Hydrogen however, but they are not very good for mass production - electrolysis, special algae, etc.
As for gas packing more potential energy, I believe certain nuclear isotopes pack more energy per weight than gasoline. Yeah, I know. They do not burn in cars. As for octane ratings in ethanol and other bio-fuels, I will have to defer to others.