If the engine ran rough soon after starting, it sounds like a fuel issue, particularly if the engine ran more roughly when accelerated. I would check the filters ( see if dirty) and the off/on switch ( may be blocked by diesel bug).
Do you have a good water flow out of the exhaust? If not, check the salt water system. ( Strainer, Impellor, Heat exchanger, exhaust elbow)