Why is the pump coming on only when the water is up to temperature? I may be missing something but I'd have thought the most economical solution would be to have the pump running all the while the tank is heated, so the water heating backs off only when you have a full tank of hot water.