I found a loose wire behind the fuse panel under the steering wheel area. It's the wire leading to the fuel pump fuse coming from the ignition. It powers the fuel relay and oil pressure switch, and keeps the pump running after the initial 15 to 20 secs, now that it's live. Now it keeps running.