I don't see diesel being phased out for agriculture or construction equipment anytime soon, usually too remote from the grid and they can't afford charging downtime. However, I welcome replacing what we can with electric. It's a slightly specious argument that simply because we can't replace all use of diesel there isn't a point to replace some usage. City buses are a major use, and are located in a much worse spot for pollution, at least as it affects people's health. How is less fossil fuels being used a bad thing, there is no possible way we can replace all uses in one fell stroke.
Indeed, but—since you mentioned it—there are a lot of missed opportunities in electrifying short range passenger ferries. Many ferries might only sail for 20 minutes and remain docked for a while where they could be recharged. Even on a busy ferry routes, a natural gas powered boats might actually make a lot more sense then a diesel powered one. The only real use for a diesel engine now might be for long distance cargo vessels, cross ocean passenger ferries, and very very huge fishing trawlers (although I would very much like to see the big trawlers vanish into history).