I'm a bit of a "broken record" on the subject ... been there a few hundred times myself. All the stuff you are currently doing is good. But be sure to include changing out, with new, the "PCM power" and the "fuel pump" relays. Beneath the hood, near the battery. Both of these relays feed the fuel pump in series. If either gets a worn/burned relay contact ... they will chase you around in circles!