For upgrading to aftermarket Rotor's/Pads.......Some of the ones to look at would be.....Powerslot.......Stainless Steel Brake Company....EBC.....to name a few......Depending on your Budget, I would mentioned swapping out your OEM Rubber Brake-lines W/Stainless Steel Braided Brake lines......with New Rotor's/Pads, would be a Huge improvement over your Stock Brake setup you now have.
Edit:.....I would also mentioned that this would be a Good Time, to flush your Brake Fluid....