On either brake, I'd recommend Koolstop salmons -a brake upgrade that is a huge bang for the buck as far as I'm concerned.
BBB 3-compound pads are also good and much more widely available than the Koolstops, eg in Australia most bike shops wil have BBB but you'd have to get Koolstops shipped.