Buy DS2500s
I can't say for your setup, I've always thought uprated pads with standard discs was better than uprated discs and standard pads, don't know why, just what I've always thought for some reason.
I have ds2500s with standard discs and the increase in stopping power is night and day over standard set up. Even when cold and in winter, they're at least as good as standard, just slight squeaking. When warmed up though, my god they're amazing. Even as a driver they can shock you at how quick you slow down.