It's a difficult situation. My first thought was to make a slight change that would lead to a smooth transition (less work for our gracious, and surely busy leader). Maybe with the next major upgrade to the Everything Engine a more complex solution could be implemented. But either way it warrants a careful, well thought out solution.
We can always leave the default version (5/6) to a user setting.