tankless have lots of downsides. your probably better off installing standard power vent gas tank units and add a recurcilate pump so you waste zero water. you puh a button when you need hot water and the pump turns on.
you have instant hot water when you turn it on
water heater manufacturers are moving to more fficent heaters, waiting a few months should get you the new more efficent design