...
Here is a picture of the finished fix. Should be more maintainable now that these changes have been made. The new solenoid valve will allow a lot of water to pass so I have ball valve (not shown) limiting the flow to a trickle.
Future Updates
...