I vote CBM - It seemed like such a necessity in this forum that I've never thought to play Vanilla. Also, my impression of CBM was that it was mainly about improving the gameplay by making more different strategies viable. This seems like a laudable aim.