The government needs to be removed from marriage completely. How does government have the right to re-define an institution not of their making? So much for separation of Church and State - but we all know that concept is a one-way street.
I’d be happy with such a development. However, if the government is going to be involved, it has an obligation to institute policies that are for the betterment of society, not those that do it violence.
Having said this, removing government wouldn’t stop a sick culture from diminishing marriage. We’d still have freaks pretending to marry and the media and Hollywood acting like it was real. So this battle still would need to be fought.