Edit - A light short range car that charges in a few minutes, or hydrogen, is the way to go.
No. Hydrogen is not the way to go. Hydrogen is an awful transport fuel. It has an appallingly low density, so much that it either has to compressed to 900 atmospheres or liquefied at -253 C. Neither is an option that is remotely safe to be used by the public - the compressed gas cylinders you may have seen in industrial settings only go to 230 atmospheres, and even then they are handled
very carefully. And even after going to all these lengths, the hydrogen tank occupies far more room than a conventional liquid fuel (so I hope you're not planning on taking any luggage... ).
The infrastructure used to handle and generate hydrogen is very specialised (metal lined pressure vessels of woven carbon fibres is typical), bespoke, expensive and some cases - such as the pressure vessel above - unlikely to see any economies in scale by scaling manufacturing up. Substituting diesel and petrol infrastruture for hydrogen is not a realistic prospect, even over a timescale of decades.
Then there's the awkward fact that using hydrogen as a fuel means you end up - at best - losing 66% of your energy source. That assumes using fuel cell powered vehicles. But, well, the fuel cells that work all use platinum. I've just spent £1500 on grams (!) of platinum wire (ironically we use it essentially as a minuture fuel cell, as it provides a stable voltage reference) which ought to be a clue as to why this is a bad idea. Plus, only 200 tonnes is mined every year, for rather valuable industrial uses: we simply don't have enough of the metal to spare on a large fleet of hydrogen fuel cell vehicles. Using conventioanl IC engines, your energy losses approach 90%. That's just not feasible.
Put bluntly, hydrogen just doesn't make economic (or thermodynamic) sense. The solution isn't hydrogen: the solution is
fewer cars. This hydrogen economy fantasy is deeply unhelpful, as it is used to justify the pernicious idea that we can blithely continue with business as usual. We can't.