Another thought, if you want more stoping power without going to discs you could always go with Magura's Hydro rim brake. I ran the race lites for years and they would stop on a dime. They do add a bit of weight but they are incredable stoppers.
Slainte