I would definitely go BACK to your doctor. Controlling your BP is probably the main concern. Edema adds to issues but is secondary. It's clear they have chosen calcium channel blockers for you but there are others to try within that drug category. When can you get back in to see your doctor? How long have you been switched to cilnidipine?