> I think there's a danger of that, at least if countermeasures are not easily available

Note that the era of free navigation is recent and short. Countermeasures would certainly emerge. But shipping wouldn’t stop.

> Are there enough military ships to do the escorting?

For critical passage, yes. If Iran is just taking pot shots at any ships anywhere, you basically have to actually blockade it.