Yes, I agree it is confusing. Just to add to this, it is the same with Frau. It means woman as well as wife. No wonder the Germans get confused when speaking English - they often say my woman or my man instead of my wife or my husband!
I feel that "Der Mann" should only be accepted as "The man" this early in the lesson. How was I supposed to know that "Der Mann" is used for Man and Husband? I also feel like Ehemann should just be used for husband. Less confusion.