i'd just install a electric storage hwu you'd have to ask a sparky if it's possible.
if it's going to be rented out, i'd install a LPG continuous flow hwu. as there'd be less running of pipe work. downside more expensive to run but tenants would pay the bill..