Dont forget Hydrogen is compressed gas: would be very hard as a fuel source in a boat and has no where near the efficiency as petrol or diesel (think its currently 30% vs 60%): i'm sure this will improve with time. Any battery will still have charging and weight implications. Dont get me wrong- i'm all for alternative fuels but when you take into account: Weight, safety, efficiency, reliability- fossil fuels are a long way ahead...
For the gap to substantially close ie as a suitable fuel use for a boat:
Batteries will need to be super light, recharge in an instant, be chemically stable, be constructed from viable materials (lithium is somewhat limited) and be affordable.
Hydrogen : I cant see a compressed gas being a viable fuel alternative in a boat. Fuel tanks would need a period inspection. All hose fittings would need to be bullet proof and corrosion of fittings would need to be sorted (hydrogen is stored under some pretty high pressure). With the lower efficiencies of the fuel i'm asusming you would need to carry more weight than the fossil fuel equivalent.
Nuclear: Dont think we will see boats with a mini nuclear reactor on board... Yes nuclear power can be used to create power which can then be stored for the use within a battery but that brings us back to point 1.
It easy to hypothesise that the gaps can be closed but if we go to that extent then where do we stop- dont forget we are currently working within the first law of thermodynamics- were merely transferring energy from one form to the next? I'm just laying down the facts of what we have available to us with our current technology. If i was a betting man my money is on batteries but electric motors/ reliability and suitability in salt water environments has me raising an eyebrow.