Shaun,
The brake upgrade that Vintage did on my car back in March made a huge difference. The braking on the car as originally delivered was on the "scary" side - very hard to slow the car down. I was not comfortable with that situation.
Jay recommended going with Brembo Slotted/drilled rotors and performance brake pads. Made a huge difference. It's does not stop like my 540i, but it is "a lot" better than it was before. I am way more comfortable driving it now.
Jay can get you the spec's for the exact parts he used on my car.
Hope you are well.
The car is a blast to drive.
Mike