If you're changing the discs as well as the pads and don't want OEM, take a look at the GTT Spiroslots.
GTT 'Spiroslot' Brake Discs
They have more stopping power than OEM, better fade resistance, better initial bite, but are identically sized - so there'll be no need for spacers or anything no matter what wheels you've got fitted. Actually, I found it cheaper to buy the Spiroslots and pay for the (really very small) insurance increase (with Adrian Flux) than it would have been to purchase another set of OEM discs and pads.
I did have some initial problems with the installation by a third party, but once this was sorted I've been very happy with my Spiroslots. One thing I would definitely recommend is to make sure you take the dot 5.1 brake fluid change with the GTT setup, as you'll find you'll boil the brake fluid (I did) with over-exuberance using your new brakes. One other thing to note is that brake pad wear sensor for the rear will not function with the Spiroslot pads, but the front brake pad wear sensor will. (I think I've got that the right way round).
I'm sure you'd enjoy them if you opted for them. Read the thread I linked to above and have a think on it.
All the best,