Hey bro, gear is going to cause some water retention, just because of the added sensitivity to minerals. A sure fire way to lower water retention would be to increse water intake. This will help to flush minerals, specifically sodium out of your body and get you tighter. Also, it would go without saying, to watch how much salt you eat.
You may also find that a little more adex will help. You wrote .5mg, but Im not sure if that is ED or EOD. If it's EOD, certainly move up to ED. With 16% body fat, you're more likely to hold water, but as you lean up, your estrogen will more likely be easier to control