Unity in diversity or ... diversity in unity?

One of the phrases most of associated with the ecumenical movement in the past fifty years has been the slogan, "Unity in Diversity", the idea that church unity does not mean uniformity. It has also been suggested that this slogan has influenced the European Union in its quest - it is used as the title for a document setting out different persectives and common goals in the enlerged EU. But one of the issues I have been wrestling with recently is whether it is better now to speak of "Diveristy in Unity" - in other words: rather than taking the idea of unity as normative and explaining how this does not mean uniformity, one starts with the diversity that exists in the worldwide Christian community and asks how this diversity may be held in unity.