I have installed electric pumps in place of the mechanical pumps to get the unit going the, key point is to bypass the mechanical pump with the electric pump, nice part you don't have to hand prime the system, if the problem of fuel in the oil goes away you know it was in the mechanical pump, if you still have a problem with diesel in the oil the seal on the injector pump is the next place the diesel can get in the engine and you would need it rebuilt, I have no idea what that would cost, I have seen kubota engins with 12,000 hours with no issues on the injector pumps just the mechanical pumps going bad.