I have had wonderful success with the ACE inhibitor Monopril. I've been taking it for 16 years with no issues.

I recently took a calcium channel blocker (norsvac I think) and it was the worst. Like you, I could not see my ankles due to water retention... and water retention in my legs too. I felt like I was walking around with waterballons under my skin.

This medication also made me quite tired and I started gaining weight.