Sounds like you need two bikes for two different applications. Keep the bike you love and start a new relationship with a sexier new bike. Some days you'll want the comfort of your old familiar hybrid, and some days you'll want the performance of a perfectly tuned road master. It sounds like you know what you want, but you're somehow convinced that the relationship between a person and their bicycle should be monogamous.