X2 on the aftercooler servicing. This is REALLY important.
Another outfit who can look at those engines for you: T&S Marine Engines in Crisfield, MD; 410 968 2970, very experienced, absolutely honest, and have sold and serviced many of these engines. Ask for Dave or Timmy.