Swapped the fuel pumps and the problem has seemed to have gone away. I've run it under a 1/4 tank many times while in traffic and hitting stop lights and it's not had a problem yet.