Hi Paul, could you also address the other 2 ways please? 

If they're still working wharfs, maybe they should be landuse=industrial industrial=wharf , or standardised to how other wharfs are tagged in the UK?