I've got the exact same symptoms you have since I started taking Accupril with my Norvasc. I do get the cough at night but it isn't as bad as yours. If it was I would keep trying different prescriptions until I found one I could live with. Accupril has helped my blood pressure go down even more.