the bypass valve is necessary, as when both heating and hot water valves are closed the pump will have no where to flow to, although if its lasted 3 years already :)
i think you may need to get the leak fixed :) something no doubt the original plumber could do before you consign him to the...