I might want to replace the 'water valve', first, before the pump... unless the seal on the pump needs replacing. Either way, it sounds like a seal link somewhere in the fittings/seal. Another consideration, if you are using PVC, then you could try 'PVC Cement' to reinforce the seals.