Hello Chris,
Your solution is only a partial fix. If you were loosing water from your water heater then the heaters non return valve (NRV) must have failed. But if the water was emptying back to the aquaroll then the non return valve in the supply must also have failed. These are two independent NRV's
The one on the heater is essential as it is there to maintain the water level inside the heater. If the NRV fails the water level can drop exposing the heating surfaces. This can lead to the electrical element burning out, or the gas system over heating. If this NRV fails it must be replaced for your safety.
The failure of the NRV in the cold supply is less dangerous, but it will very annoying on a pressurised system as the pump will repeatedly cycle to rebuild pressure. It will be less noticeable on a switched tap system, but it will probably produce air in pipes before water is delivered.