Getting Off Diuretics, experiencing big time swelling, Help!?

After having my 2nd baby with Pre-Esclampsia and Hellp disease (again), I was put on water pills to help my blood pressure and edema. Well, it's been 2 years now, and my BP is back to normal(121/72). But as soon as I miss 1 day, my feet, hands, and belly swell. Its very alarming and uncomfortable. No, I'm not prego again. I've totally omitted salt intake from my diet. And my family doctor has checked all my kidney and liver functions with blood tests, ultrasounds, and MRI's. All come back normal. I have been off my HCTZ now for 5 days, and the swelling has not gone down, even wearing flip flops are intolerable, and leave deep indentations in my feet. I exercise regularly on the elliptical for 30 minutes every day. Is there a certain doctor I should see? Help!!!!!