Fresh Tank Filling on City Water

So as a temporary fix, I decided to adjust the plumbing to bypass the tank select valve completely so that way whatever is causing the problem is also bypassed and the city water won't leak into the tank. Turned out to be way harder than I thought. The factory setup had permanently affixed connections to most of the fittings in that area, which makes absolutely no sense to me, but whatever. I'm going to order parts to make all the connections in that area screw on connectors so I can easily pull out parts for cleaning, o-ring replacement, and whatever else might be needed. If the pump still has issues after that, which I'm sure it will because of that one screw, I'll replace it as well and see if that rectifies the issue. At the end of the day, though, I just don't want water leaking out of my trailer.