Brembo Updrade

I'm strongly considering upgrading the front brakes on my '07 675. The stock Nissin brakes (which the previous owner allowed to sit idle for years and fill up with tar) have just not really been performing as well as I think they should. And this after LOTS of work on them with the dealership. The rear brake is fantastic and I wind up relying on it as much as the fronts whenever I'm stopping.

So I'm considering considering the Brembo M4 calipers, which are the least expensive option but according to their product data sheets they fit the '06 and so I would assume the '07 as well. And I'm figuring on replacing the master cylinder as well. The M4s are a monoblock type. Would there be any reason to not chose these calipers for this bike? Or might there be fitment issues with brake discs, etc.?