Tankless water heater with re-circulating pump