I went for after market with DBA's and Ferodo's and did them myself (well the ex did them I watched :P ) I am very happy with them. A few of the guys on here have done the
JCW brake upgrade and have been happy too - just depends what your after and how much you want to spend.
K