EBC pads (Green or above) work very well even on standard discs however EBC disc's are perhaps less impressive as an upgrade after the pads. Cross drilled/grooved tend to produce more noise under braking and by nature don't promote even pad wear. Ultimax seem to be EBC's answer to the problem. Either way you'll be happy with the improved stopping power 
If that's not enough consider braided lines...
The only Mintex stuff I had lasted about half as long as the OE pads Toyota sold me so it was a false economy, disc wear was also worse
If that's not enough consider braided lines...The only Mintex stuff I had lasted about half as long as the OE pads Toyota sold me so it was a false economy, disc wear was also worse