You may want to replace the oil pump with a new unit. I have great success with that Purple cleaner from Casto. The same guys that make the oil products. It's biodegradable, effective and rinses with water. If you live in a cold climate, warm the parts and solvent up. It works better when warm. A final rinse with brake cleaner helps too.