You'll get a much better braking improvement by cleaning/rebuilding your calipers. You'll get even better braking if you swap your master cylinder for a radial one. Take your pick; any newer Kawi has them.

 

Nissins are way better than Tokicos... They're not 'Suzukis', actually Honda owns Nissin, but all Japanese bikes use Nissin/ Tokico...

 

Suzuki parts are good, my last bike was full of 'em and never gave me any issues. I was a little skeptical of trading it in for a bigger bucket of Kawasaki bolts but it turned out alright.

Brakes are brakes. If they aren't working properly clean them out and get new pads, new lines, or whatever the system needs. They were originally designed to stop a SS, so I don't see why they would cease to do so after a few years. After that if you still disapprove of the braking performance look into upgrades. Unless of course you have money to throw at it just buy whatever you fancy is best.

 

I love the radial Brembo master and R1 monoblock calipers on my 7R. They require a fork swap or conversion brackets, but the feel on the street and track is amazing. I agree with the above though, swap in a set of bolt on 4 piston Nissins and a radial master, and they will feel much much better.