looking for ideas on fighting a 2-3-1 code on 94 855T w/204k. there is also a hard start (15 seconds cranking) issue that is intermittent.

here's what i've done in last 60 days: volvo plugs, cap, rotor, fuel filter, fuel pump relay, fuel injection relay, used FPR, and checked vacuum leaks with TB cleaner spray. cleaned up TB and hole down to EGR, which was completely blocked. the fuel pump is 1 yr old walbro insert type. fuel economy is 17-19 in town and 22-28 mpg on highway.

fuel pressure is 37 psi upstream of filter at idle, and 33 psi at fuel rail at idle. revving engine did not increase pressure. engine off, pressure drops quickly to less than 10 psi. same with key in position II, pressure spikes to 38 psi then drops to 8 psi and holds.

any ideas what to try next? i am suspecting the pump may be part of the problem?