tankless or high efficiency tank type upgrade

As my 40 gallon gas, Bradford White heater is getting old , I am struggling with a choice between tankless and high efficiency high or quick recovery traditional water heaters. I have done sizing requests on the navien web site and they indicated thier largest unit would likely work, but would...