You could go the conventionel way of installing a ABV between the boiler flow&return if converting to a S plan otherwise convert to a W system with a 3 port diverter valve.convert from the existing W plan...
If I changed it to S plan, when both are satisfied there would be nowhere for the residual heat to circulate ....as mentioned, the bypass loop appears to be just that - a 15mm pipe around the pump which I am not sure IS a bypass loop as such
"only" CH or HW is fine as it is quite a small house and the HW requirement is low