As I said the other night a set of OE or OEM discs & pads will feel a million times better than something that has been in the car for 17 years.
Otto do a good price on ATE discs & pads.
A lot of those "upgraded" type kits are aimed at "fast road" or track use. Sometimes they don't work so well from cold, they need a bit of heat to be optimal. Good luck with the new brakes.