I'm keeping the BB7's ( gone for the disc versions of the Rolf Wheels) I have spent a bit of time replacing cable outers and filing square cable ends, using metal end caps to get the best possible feel and it made a big difference; the BB7's have plenty of power and feel now. Don't see any reason to change other than for a few grammes.

You're right about the fatty fork; Mine is a 2010 model too and the accuracy of steering above 40 mph is the best I've come across on any bike I've owned. I won't change it unless I can find the right fork.