Thought I add this to the post.
Upgraded my front brakes with:
M135i Brembo Calipers, painted in the color of the ceramic M4 brakes of BMW
Stoptech 340mm slotted rotors
Stoptech sport pads
Hell braided Lines
Motul 600 brake fluid
Very happy with the results, no adjustments or spacers where needed