I would get checked out by a doctor first off. A warning sign of Diabetes is swollen ankles/fluid in the legs. I think I heard something about heart disease too. Not to scare you but just be on the safe side.
Otherwise If you are bloated, dont restrict water intake. It seems counterproductive, but drinking more water will help you flush out your bloatedness.
Eat high potassium foods also to balance sodium levels.
Some foods are natural diuretics too. Like lemons. Do a search online. But stay away from water pills and caffine in huge amounts since they will only dehydrate you, and then the problem will come back two-fold.