OK I think I have it narrowed to fuel delivery.
Coming home today (6 miles) I could only drive if I barely pressed on the accelerator pedal. If I pressed too fa the engine would just start to die out. Let the accelerator up and it smoothed out. I could accelerate, but VERY slowly.
When I got home and inside the garage I pressed the accelerator down (in neutral). The engine just died. Tried an immediate restart and best I could get was Idle. About an hour later I tried again. I got the normal whirring for a few seconds and stopped. Started normally and ran great.
When you initially turn the key on you hear a "whirring" of the fuel pump for a number of seconds. That's when it's pressurizing the system. Mine will do that, but if it lays idle for some time there's another noise following the whirring. It lasts for a couple of seconds also.
How difficult is it to get to the fuel pump?