Yeah, that's what I ended up doing. I think I'll just keep this bike as-is, and look into getting a road bike. I tested out a really nice Fuji Bordeaux from last year with all Campy components which I really liked. I think I may pick that bike up.
Thanks for the advice, everyone.