It seems to me that the answer is simple.
- "Marriage" is something between a man and woman in church.
- "Civil Union" is something between 2 people governed by the state & is legally binding.
In other words: Remove "marriage" from the legal language.
Wouldn't this solve the problem.