I think that would be a neat solution. Five years ago I would say that it'll never happen -- people seem awfully invested in the word "marriage" -- but given that federally-recognized civil unions are a significant part of the Obama/Biden platform, we may indeed see a move in this direction, especially if (god forbid) Proposition 8 passes.