I've decided to stick with the mountain bike until I see my lifestyle shift towards more cycling (i.e. if I am using my bike every day I will get a road bike, maybe in the winter or next year)

I am going to put a cro-moly fork on my bike ($85 estimate from the LBS including labor), change the handlebars or add barends, get a new, non-grungy looking saddle, and get a lighter lock than the giant Onguard I am using now.