As contra indicative as this may sound: avoid wherever possible sodium and increase water.
More sodium will only result in your body retaining more water or "bloat" whereas, and as contradictory as this does really sound, giving you body ample water, will actually cause it to release more water (decrease "bloat"). No, you don't have to drink a gallon but you should drink some water at least once an hour or so. Most people are dehydrated and don't even know it. As long as you don't drink a gallon in an hour, you'll be fine. 1 bottle of water every two (of waking) hours would be sufficient.
Substitute table salt (as in, don't even use it) wherever possible with lemon/citrus or my personal favorite, pepper. You won't miss it after the first two weeks. If you absolutely must use table salt, use sea salt (IN MODERATION). Also, check your packaging labels and don't you dare buy anything with more than 600mg per serving of sodium. It's bad, put it back. You can break this general rule on chips and beer (IN MODERATION), but everything else... leave it on the shelf, you don't need it.
This is part of manhood and has nothing to do with certain kinds of T (regardless of where it comes from, it all does the same thing). Avoid the salt and increase your water and you should see an improvement within 10 days (10 days is how often your body completely replaces all of its fluids). In addition, to speed it up a bit, try some natural diuretics (e.g. tea/coffee).
Going from one sex steroid to another kind of puts your body in panic mode for a while, you just have to wait patiently for it to adjust before things like this will calm down. It's just the nature of the beast and there is no avoiding it. Kids go through the exact same thing... they get plumper and even fatter, before they start getting their growth spurts and have these things gradually regress... its the same thing for us, sans the linear bone growth. It will go away, it just takes some time. My grandmother flipped out thinking my kidneys surely must be failing or some crazy ->-bleeped-<-e because I did get more plump in the face and the hands and feet, but that's gone away. Your lymphatic system (including your renal system for that matter) has to also, like the rest of your body, adjust to running on much higher androgen. Once that happens, these effects will go a way. Cause for concern would be if, within two years, they don't. Don't worry about it otherwise.