Hydrogen is probably going to get pushed out of every niche where it might be viable. Batteries tend to get better by 5-8% per year, and there's every reason to believe that will continue to be the case. Run that forward for another decade or so, and even things like heavy construction equipment and transpacific airplanes are viable on battery power.