We have the original boiler and pump in our house, and the pump is shot. There also appears to be a leak in our hot water heater. We are not sure whether to replace just the pump, the pump and boiler, or get a combined pump/boiler/hot water heater (one plumber suggested the Samsung Quietside dual-purpose water heater system). Any advice?