I have a 2005 Giant STP1 which according to their website, comes equipped with AVID CPS brakes. I'm assuming these are what Avid calls "mountain BB" disc brakes since it is older than the BB5 or BB7's. The problem I'm having is that it is too sensitive and the power to the disc is non linear, so I'm looking for a solution to improve modulation. Will upgrading to BB7's help? What about different brake pads? Or is hydraulics the only way?