Re your solution: What I've been saying (and what the former rector of our church had been saying) for years. Get the state out of the marriage business and the church out of the civil union/state sanctioning business. Do one or the other or both as you prefer.