Upgrade what you don't like. For me it was the brakes so I got Avid BB7 brakes.

I wore the Continental back tire down to the threads, so I move the front tire to the back, and installed a Schwalbe Marathon Supreme on the front. Very nice tire for street, though it does cost $80.