leave the fuel pump alone as long as it works, but definitely replace the water pump. It's only another 4 bolts.