Hey bro, a certain amount of water retention and bloating is going to happen when you are trying to add mass. Just the diet alone is going to cause more bloating than a cutting/fat loss or maintance diet. Bodybuilding is a give and take. I don't beleive you need to be a bloated mess in order to grow muscle but yea, you're going to add some water.
If you want to keep it on the leaner side, stick with some test and EQ. Throw a little adex in there, just to keep estrogen in check
Test E 500mg EW
EQ 400mg EW
adex .5mg 2x wk to EOD as needed
anavar at 50mg ED (Dont NEED this, but it wouldn't hurt and it would kick your cycle off quickly without bloat!)