If you want to stop water retention, use an anti-estrogen like Arimidex, Femara, or Aromasin. They will stop the aromatization in the first place. Nolvadex is a SERM, that works by attaching to the estrogen receptors, mainly in breast tissue, to stop the effects of estrogen already present, it will do very little in stopping water retention.