I agree with Bob, adding:
Put the HWS inside the store room or laundry rather than outside in the cold. You might have to replace the walls/floor/ceiling in its old home as it may have rotted from condensation in its past life.
I would turn the WIR into an ensuite and extend the front...