Oh yeah, I forgot to mention.
I have a pretty nasty broken exhaust, before the 02 sensor. I know in theory this can cause an idle surge, but the exhaust has been broken for about 3 weeks and the surge has only occurred this week since the fuel pump relay issue.