Do you really think that America will be passing the laws you are calling for?
There is no legal requirement to obtain a marriage license to get married in a church. If the church in question wants to conduct the ceremony without a license, then that's up to them. In the eyes of the state you are unmarried if you don't get the license* regardless of whether you are married in a church. In European countries the civil and religious marriage are often separate ceremonies. For whatever reason the cultural norm in the US is to combine the two.
Given the widespread avoidance of marriage that has become the norm, homosexuals may be the only people who get licenses in 20 years anyway. I don't see much point in continuing with an immoral licensing scheme that is quickly going the way of the dodo.
(*a few states recognize common law marriage.)