Maybe someone else has said essentially this (I skipped part of the thread, mea culpa) but here's my thought:

The State--ANY AND EVERY state--ought to stop issuing "marriage licenses". Instead, they issue "civil union licenses" to all couples.

If Johnny and Suzy are to join under State sponsorship, they would apply for a "civil union license". They'd go before an appropriate state-authorized individual (they could choose a preacher, judge, etc., just like now), who would join them pursuant to the license. But if they want religious sanction, presumably they'd have a preacher do it, so that they get two-for-one, so to speak.

Any two individuals, of whichever sex or combination thereof, if they wanted to have the legal support of the State rather than shacking up, would have to get and exercise their civil union license. The officiating individual, as now, would certify to the State that on such and such a date Johnny and Suzy (or Tom and Dick or Laura and Mary) came before him/her in the presence of witnesses representing the community and got officially stapled together (I'll avoid the familiar phrase "tied the knot" because it's so associated with past practice and understanding).

Under this scheme, the distinguishing word "marriage" is separated from State recognition, but different churches may attach the word and concept to the happy couple, of whatever mix, if that church sees things that way.

YMMV.

Dave Oesterreich