energy density of lithium batteries is higher than for hydrogen storage.

opposite is true by a large margin. You’d still want a hybrid power train, and a charging from solar or BEV option never hurts, but H2’s advantage is quick refueling with battery charging on the go.