Try reducing the fuel pressure. Or shut the pump off a few seconds before shutting off the engine. A nuisance, but it'll show you if the pump's the problem.