Definitly the HWS.
If at all possible, try and find a similar model that doesn't require much to fit it up. Australian Standards basically states that if you need to change any existing pipework or relocate a HWS, then a Tempering Valve must be installed if there isn't one already fitted...