This is all silly.

Abolish marriage completely, give everyone the ability to get civil rights with anyone else (18 and older). Religious union should be left to religion, it can be recognized by the state as a title but with no rights. This way, klingon and christians alike can be happy.