Based on what? Just looking at the density is not enough. You have to look at the whole system from generation to actually driving.
The hydrogen system is even in the best case, assume multiple many, many improvements in mass manufacturing and so on, only half as efficient as an electric system.
Battery technology is improving at a far faster rate then hydrogen technology, its not even remotely close. By the time your predicted ' (1, maybe 2 iterations away)' happens, batteries will have made 5 iterations.
The DoD for example is already sponsoring a massive program that companies lots of universities and national labs to work on Lithium Sulfur batteries that could double or triple the density of current Li batteries while also being quite a bit cheaper.
Silicon anode batteries are already in the early stages of commercialisation and they will make commercial aviation feasible.
And even if you insist on using chemical fuel, why would you use hydrogen? If you want to drive a truck a long distance at a time, you could just use dimethyl ether, methnol or something like that. That would solve tons of problem with storage and so on.
I really don't understand why people are so fascinated with hydrogen, while it continue to disappoint for 30 years. Even in the space industry, where fuel cell used to be used all the time there use has fallen out of favor.