I ended up buying the Grimeca rotors (standard ones) and Ferodo pads from Motobins. Install went fine. I can't say there is any noticeable difference in performance, although it does stop smoothly without the pulsing now.
I went with the standard rotors because, after researching and some observation, I don't think the rotors were actually warped. I had read elsewhere about the BMW pads sort of "welding" material to the rotors, especially if put way wet. I think that may have been the situation with mine. (although the dark scuffs were 180 degrees apart which may be from warping). It's also the reason I went with the Ferodo pads rather than OEM.
To soon to make a recommendation, but so far so good.