My B21F with Continuious Mechanical Fuel Injection surges at all speeds, most noticeably during moderate acceleration. The fuel pump died a couple of months ago and was replaced. The pressure is currently fine. A heavy dose of injector cleaner and new plugs didn't fix it. I figure I'll need to replace the fuel distributor and/or the injectors to solve this problem. I'm dreading tearing the engine apart to replace the distributor, but I suspect that replacing the injectors only will not solve the problem. Should I take the plunge and replace the fuel distributor or start by replacing the injectors, or should I do something else first? Thanks.