These days does it make more sense to upgrade my failed combi with another combi or go boiler only (less BTUs) and add in a heat pump water heater?