So the most straightforward thing would be to give the partners in a civil union the same legal rights as in a civil marriage, and leave aside the business of officially using the same term for it. I'd have thought that would take a lot of the heat off the issue.

To the best of my understanding that is the situation with what are called "civil partnerships" in the UK, and in a number of other countries.