How to replace/re-engineer leaking fresh water drains

Sounds like a good solution, and it appears that you will be able to get to the components a lot eaiser than in some cases. Just be sure to drain the tank before you start. I have the push-pull valves on mine, and they always seem to leak a bit at first. I just rotate the stem a bit, and they seal. Alwo, best to do this stuff when its warm, cold temps and water make it more difficult and the seals or o-rings get hard.