Run,

If you want to take something that might be tailor made for you, you might consider spironolactone (Aldactone I believe is the brand name.) I'ts both a diuretic for BP treatment and an anti-androgenic.
It might suit your needs to a tee.