Deregulate marriage entirely–let it be a private matter, based on contract if the parties choose to sign one. As for government benefits, make them dependent not on marriage per se, but cohabitation or something along those lines.