Have you swapped your fuel pump resistor? I had the same thing happened to me and it ended up being that.