Good pads on caliper or canti brakes can make a huge difference in stopping feel and power. I'd say you don't need the disc brakes and associated complexity. Just swap out the stock pads w/ Kool Stop salmons and you'll be fine.