I think you're right. They should simply remove all benefits from marriage (tax, legal rights, etc.) and let people have whatever type of civil union they desire (which would deal with all the benefits once held by marriage).

The last part of your comment was not left out to intentionally skew your meaning. I think your most recent post clarifies things quite well.
_________________________
Dave