Sooner or later this will be the case anyway I guess, because some hetero couple will sue that they are discriminated against the gays, who have the better system.
That actually happened in Sweden before we adopted a gender neautral gender law. Several straight couples applied to become "registered partners" because they preferred that over actually being married and took it to the court when they were denied.
See that, I went all Tender Branson on this thread and made it about my own country instead.