Get a Rinnai instant if you can. Rinnai also make indoor units but these need an additional flue kit.
http://www.rinnai.com.au/hot-water/continuous-flow-hot-water-systems/infinity/26-(internal)/
But the problem may be the existing gas pipe is not large enough for the rinnai.