I think the market will split between the two based on the use of the cars.
For "city cars" (and some municipal vehicles), going with electricity is a better approach because owners of those vehicles can charge them during the night and use them without worrying of getting out of charge due to the small distances they'll make during the day.
For everything else hydrogen is the way to go because, once the infrastructures are done, it will be easier and faster to recharge and the fuel tanks will give those vehicles (not only cars, but also vans, pick-ups, 4x4 and trucks) the autonomy they need.
Please excuse my bad English.
Currently gaming on a PC with an i5-4670k@stock (for now), 16Gb RAM 1600 MHz and a GTX 1070
Steam / Live / NNID : jonxiquet Add me if you want, but I'm a single player gamer.