did u fit a non genuine air flow meter? had trouble with these in the past where they only work properly with a genuine part fitted!
also was there any metal particles at the bottom of the fuel filter housing?
this will indicate if your fuel pumps had it or not!