Raybestos QS pads with proper bed in procedure.
If you aren't tracking the car regularly there is NO NEED to upgrade.
Your pads are probably the culprit and suck. If there is a ridge on the rotors you need to replace them.
other than that you should be good to go unless you want to spend endless amounts of money, time, and research on brakes, Brunos site has a lot of info if you do want to go that direction.
95 E34 530I V2.37
===========
Those who make peaceful revolution impossible will make violent revolution inevitable.
John F. Kennedy