Simple solution: any consenting adults should be able to enter, modify, or withdraw from a marriage contract with any other consenting adults at any time.
Female, male, other, gay, straight, bi, mono, poly: consenting adults should be able to enter into contracts with consenting adults.