I was so swollen after one of my pregnancies that my doc put me on a diuretic and I LITERALLY lost 20 lbs in a week. I pretty much stayed in the bathroom the whole week.
I had major swollen feet and ankles after i had my first child. They told me it was normal due to all the fluids they had pumped into me during labour. It was so uncomfortable. I was also swollen the last month of my pregnancy so i assumed after i gave birth the swelling would go down. NOPE! *lol* It lasted maybe three weeks then finally slowly went down.
The swelling is normal and is usually gone about 2 weeks post partum. I have no idea about the BP issues. If your doctor isn't concerned then I would just take it easy and drink a ton of water. If it continues to be an issue after the swelling disappears then you will definitely want to bring it up again.