In the USA, (nearly) all residential WH are now required to have protection from igniting vapors from volatile liquids that may be in the area. These have been problematic for some companies. They also generally mean that a new WH of the same volume will likely be taller, since the burner design is different to prevent that ignition. I'd look at Rheem or Bradford White. Some of their models qualify for Energy Star efficiencies, and may get you a rebate from your local utility company - well worth asking.