Ideas for Keystone water connection upgrade?

Hi kfp673, We have an Cougar Xlite with possibly the same stupid docking station. That fresh water hookup is perty flimsy and the black tank flush (bottom left black female hose bib) is even worse plus there's no gravity fill for water tank. Tried using the black tank flush once and had water coming out of the fitting just inside the wall. Fixed that but was a pain to use it so we've never used it. I've thought bout changing out the fresh water hookup but seeing what's in behind it inside the wall cabinet gives me great pause (pic #1). What I did was I got a metal elbow and a screw it into the inlet and opened the little slot and closed the door so the fitting sits outside the door and then screw the hose on it. Been doing that now for the 7 years we've had the 5er and so far have had no problems.

This is what's inside the cabinet behind the docking station.


This is what our docking station looks like. Is it the same as yours?


This is how we attach the city water hose. Seems to take some of the stress off the plastic fitting.


Milo