Sounds like a good start. I also have Galfer stainless lines on mine, and they made such an amazing difference in braking power and quality on my bike. I had the Galfer pads too which were pretty solid, but switched to EBC this past season, which are also really good. I still need to get some suspension work done, although the stock stuff did a decent job this past season.