Making Hybrids Irrelevant?

Fuel cells are great, they run off of hydrogen and only produce water. The only problem is that hydrogen, unlike oil, solar, nuclear, wind, etc is not an energy source but just a carrier of energy. We need to get the energy to make the hydrogen from somewhere. While one can use the aforementioned energy sources to make hydrogen, it is very expensive, wasting well over 3/4 of the energy just making hydrogen and running it in a fuel cell.
Battery electric vehicles or Plug-in Hybrids only waste about 20% of the energy to charge them.
Additionally, fuel cells are very complex machines and will likely remain expensive for some time to come.
Thirdly, it is very hard to store hydrogen as it's small molecular size makes it leak out of any kind of container.
I also need to remind you that the FCX is actually a hybrid, using a battery, just as gasoline hybrids do, to permit a small (cheaper) fuel cell for average usage and the battery for high performance.
Best thing to do with a fuel cell vehicle: Get rid of the fuel cell and put in a larger battery to get a pure battery electric vehicle.