5th generation district heating and cooling system (5GDHC) are a relatively new concept. They use a single district loop near ambient temperature to provide heating and cooling. This paper improves on the modelling and control of a 5GDHC system called the reservoir network. The study updates the sewage heat exchanger plant model to more realistically represent seasonal changes, uses refined pump models with variable efficiency, introduces a ground coupled district pipe model to consider the inertia of the district network and implements a new control strategy for geothermal storage and sewage heat exchanger. The new approach reduced operating costs, mainly due to pumping cost for storage, sewage heat exchanger plant and distribution pump, while increasing the overall robustness of the approach in different sizing conditions. Thanks to the new controller, the pumping consumption was reduced by 21% with respect to the original baseline. Furthermore, the new control makes the system take better advantage of design changes, when reducing borehole field size and increasing the sewage heat exchanger size, the pumping energy savings become 29% with respect to the original baseline. Lastly, borehole field temperature stability was analyzed through 40 years of simulation.