Hydrogen? Mmmm. More distant future probably. Tricky to store. Highly flammable/reactive. Takes much more energy to produce than it provides at the moment.
At least diesel is a start. Readily available now. Less refining required. Less soot/particle emission with the latest technology. Way more mpg or km/l. And you can even brew your own! (which I'm sure tinpis would appreciate & already have half the gear for).