A dirty hull and especially a dirty prop, can easily reduce speed by 2 knots. It would be a mistake to make changes to the engine before you tested with the bottom and prop clean.
Whatever else you decide, do NOT ever make changes to the injection pump! That is a matter for experts ONLY. I do not mean diesel engine experts, but Injection Pump Experts. Changing timing on a diesel engine can cause very serious damage.