Since your running BB7's, why not get the Mechanical Avid levers? I've heard the BB7's perform very well with them.
I agree with the getting a better fork.
Pricepoint has a decent deal on the Tora right now.
http://www.pricepoint.com/detail/191...oil-U-Turn.htm