if ur return line is leaking why change the pump? just sending unit. anyways just start by checking small things even bad spark plugs could cause the car to shut off at stops. but yeah check all ur fuel lines check plugs make sure ur sure of the problem and dont just start changing parts.