I think I would try fixing the shut off valve leak in place, before I started replacing stuff. Its usually an o ring thats bad, found after shutting off the supply to that line, and taking the valve...