So we know its running lean, what happens if you unplug the MAF sensor?
If your adding fuel and it smooths out and you replaced the pump the only thing left is the CPI unit. I'd like to see a couple pieces of data on the scan tool before I made that call.