I can see your point----But to eliminate a potential problem source I would still request the fuel pump and ECU....The previous lock-up problems appear to be in the past. The only things that could cause the problem you are now having (barring anything mechanical like a clogged injector nozzle, fuel system problem, etc) are the ECU and fuel pump. Are you using the EDT to set up your engine---if not then it is just a shot in the dark getting the throttle points right. You can get the curve close by listening to the beeps, however, I checked my work after just going by the beeps and the points were off slightly. I doubt it is a throttle point problem though...

Kevin