This issue will not resolve itself, and in fact will probably get worse if left unattended. I personally do not think you should get married until this issue has not only been addressed, but put into practice for a good year. Then you can think about marriage.
