Hm, another thought and I'm not too sure about this considering that the last time we played with branches we ended up with people being unable to update to the right one, but:

How about a stable branch and an unstable branch? I know that's how some projects (e.g., mercurial itself) work. Among other things, we'd be able to get rid of that code freeze post merge...