The X3 M will go head to head with the Mercedes-AMG GLC63 AMG. As the AMG M177 twin turbo V8 packs some serious muscle BMW will need the S55 motor out of the F80 M3 and F82 M4.
The question is, will they fix the problems with it? They pretty much will have to. It just depends on if BMW intends to announce they made changes which publicly admits they screwed up. BMW is insecure, cheap, and petty so seeing them have to admit to design changes would be satisfying and deserved.
Keep in mind the S55 motor making its way under the hood is a rumor floating around but what other motor will the car use to competitive? The S55 is pretty much the choice as BMW does not have the balls to give it a V8 and have the X3 M run circles around the X5 M.