Have you tried counting the amount of sodium in your diet. I too have a clean diet, but was shocked when I easily got to 4g/day from sauces, a bit of salsa etc.. on just 2000-2500kcal/day. Just cutting out the worst offenders and substituting some low-sodium optioned helped my bloat tremendously. If you are eating a lot of eggs and milk, you'd perhaps be surprised how quickly it can add up. Add a can of tuna and some condiments and 5+g/day is easy.
I gained about 20lb of water when I started
TRT. Now if I go on vacation, or don't watch sodium intake as closely, I'll put on about 3-5lb in a week. Nolva didn't do anything for my bloating, but perhaps worth a try.