I can vouch for Black Diamond discs and have used EBC pads - there is another thread on here discussing EBC pads and I know brake discs have been discussed.
Are your discs worn at the moment?
If not what I would suggest is replace the standard hoses with braided items and a full flush through with Dot5.1 fluid