In reply to Martin W:
In your situation (and I have been in your situation very recently, with a full wheel and groupset upgrade to my x bike) - I would choose wheels with 6 bolt hub. There are quite a few options.... Which wheel were you planning to get?
Part of what tipped it for me is that 6 bolt is more common so there are more rotor options, I assume it is likely to become standard. They are also slightly lighter I believe, look a bit neater, and easy to fit with a torq screwdriver.