Have you checked into the tankless water heaters? A former neighbor's sister has one and loves it. I don't know rather or not it be the same with your codes as getting a new gas one though. I haven't heard of a hybrid w/heat pump.