If one of the pumps have failed, wouldn't the problem be there whether or not the engine is hot or cold? Problem seems to materialize when the engine has heated up, no surging when its cold, although when I do start the car it is a bit rough, requiring me to give it a bit of gas.