Hydrogen fuel for merchant ships isn't going to happen. Despite some issues with toxicity and pollution, the industry seems to have settled on ammonia as the main replacement for fossil fuels.

We might actually get more "nuclear powered" civilian ships, in a way. The reactors will be on land, where they can be properly guarded. And the heat and power will be used to manufacture carbon-neutral liquid fuel.