you might also ask your LBS guys about the disc brakes while you're out looking..........both my MTB and my commuter bike come with built-in bolt holes for the disc brakes, in case I ever want to upgrade. I'm guessing most of the other brands are doing the same thing.
Life should NOT be a journey to the grave with the intention of arriving safely in an attractive and well preserved body, but rather to skid in sideways, champagne in one hand, strawberries in the other, body thoroughly used up, totally worn out and screaming: "Yeah Baby! What a Ride!"