I've just went through a brake battle in my head. I had Avid Shorty 6 in front and 4 in the rear (cantilever). I was thinking new fork and the rim vs. disc dilemma struck---hard. I decided to keep the steel fork and go to wider tires. That would erase the carbon ride advantage.

Since the current fork has canti brakes and I was tired of goofing with them (whenever they needed anything) I got rid of them and went to a V/linear Avid 5 set up. Getting front and rear complete off of eBarf for twenty bucks settled the deal. Kool Stop salmon pads were a natural. They set up and adjusted in seconds.....done.

The V/Kool Stop set up will skid either tire (Schwalbe Marathon Racer) wet or dry and is very easy to modulate to prevent that possible skid. No brake can stop the bike any faster. I don't care the system.

YMMV and FWIW:
I AM aware of how stupid I was.......all of the opposing arguments were taken into account in my bad decision.