Surly Steamroller owners...

Just stuck big bars on my Steamroller. Rides like a dream.

On the other hand though, I'm looking at making some upgrades to my poloroller. At the moment I'm running a dual lever to calipers (Tektro Rsomething up front, System ex front caliper at the back (pre '07 'roller)). While they work "okay" in the dry, the stopping power isn't incredible and in the wet it's pretty much non-existent and braking in general is pretty hard work.

I've come up with 4 options, if anyone has any other options, or advice I'd really appreciate it...

1. Upgrade pads (go for salmon koolstops or something) and possibly cables - cheap but not sure if it'd be enough of an improvement
   
2. Go front disc only - excellent stopping wet or dry, would require new fork, I'm stuggling to find something with similar axle-to-crown, most are longer, making the geo slacker. Options so far: LHT disc fork, possibly Genesis Croix de Fer fork, cotic roadrat fork (except disc tab is on the wrong bloody side!). Would also need a new wheel, strong enough for polo.
   
3. V brake booster plate things - not as pricey, don't need new wheels and supposedly v brakes have more power than calipers. Downside - not sure if plate would fit to current surly forks, not sure if rear would fit as seat stay was bent a "bit" when hit by car
   
4. Welding mounts - not sure if I can be bothered, might as well get a new frame.