I went the new cassette and crank route and ended up with a slightly faster hybrid. Sucked it up and got a road bike and am absolutely in love. (Don't tell the wife) Speed, power transfer, comfort. It just doesn't any better than that. By the way,

I kept the hybrid as my commuter. It's still good, but not GREAT!