Last year we rebuilt half of our yanmar 2qm15. We were experiencing loss of power (thought to be because of a leaking head gasket) and were also having difficulty with air entering the fuel system. After the rebuild (Replaced head gasket, head resurfaced, valves replaced, new injectors, ect. ) the engine ran beautifully. I was able to reach hull speed at 80 %. This of course was just in time for the winter. About 6 months later the problem returned. I am lucky to get half the speed at 80%. Filters fine, fuel stable, air filter clean, mixing elbow clean. This leads me to the two Items I did not mess with. Lift pump and injection pump. I have also recently discoved a small amount of fuel seeping from the nut on the discharge side of the injection pump just before the hp line. Today I removed this nut and found a small oring on the threads. Could this o-ring be causing the problem? I am also considering pulling the pump and taking it somewhere for testing. It looks as though there are 4 bolts holding it to the engine. Is this an easy item to remove and is there anything I need to worry about disturbing? Any advice would be greatly appreciated.