I was about to post something rather similar. It seems to me that we dodge a whole mess of issues if we make both "Gay Marriage" and "Het Marriage" into Civil Unions, not to mention put ourselves on better church-state separation grounds (not that US Constitution amendments apply out of the country).