Last December I posted this topic here and I got a lot of good and logical tips on what could be going on with my engine. After cleaning the tank, replacing hoses, filters, lift pump, sending injection pump to a diesel shop and reinstalling the original propeller. It would still go up to 3000rpm no load and 2000rpm under load (no smoke at all). The guy at the diesel shop, who didn't want me to take him the injection pump because he said it was almost impossible that there was something wrong with it, but I insisted (and payed for it...) asked me for the service manual and found that there is an adjusting screw for the load control in the governor. This screw is right beside the water pump (raw) and is covered with a locking nut. I took the nut off tighten the screw half turn and tested the engine under load and it decreased by 200rpm so I went the other way and set it to 2800rpm under load (more that that I would se some black smoke). After an year of scratching my head the engine is finally working as a champ. Most people told me that the governor shouldn't be touched, that is factory set and you can damage the engine, but in my case it worked and as long as you don't rev the engine at more than the recomended rpm it should be fine. BTW the boat is a Catalina 30 '84 and the engine has 750 hours.I hope someone can beneffit from my experience.