In addition to the other words of advice you've gotten here, you should also try to not only keep your consumption of salt and salty goods down, and keep away from naturally high sodium foods, but also remember to drink a lot of water!

It sounds strange to be told to drink water when you seem to be holding on to it, but when your body isn't getting enough water, it tends to retain what it has in the body.

By all means ask your doctor, but I don't think it will hurt to try and up your intake of water consumption. I found that the more I drink, the more I urinate and the better I feel. My ankles don't swell and when I do the test of pressing on the shin by the knee, no indentation remains, so there's no extra water there either.

Try and drink more water. You might get better sooner if you do.