Personally, I say scrap superiority dice entirely. They really don't add much to the battlemaster except for additional rolling and an unnecessary waste of game time.
Rolling extra dice can be a pain, but a lot of the sub-classes are built around the superiority dice. I'm a fan of giving fighters more dice and more manoeuvres but any changes need to cut across the sub-classes equally I think.