I was just thinking about this situation a few days ago. I was wondering why I would ever buy a new bike to replace either of my two current bikes. (road bike and hybrid)
Other than a frame fail, I don't think I would. The geometry on both are perfect for me and I'd prefer to just replace what fails as opposed to buying another complete bike just because they're old.
We all think differently and we all know what we all want.
Are you happy with your bike now? (yes)
Keep it.
You want fast and reliable wheels? (yes)
Get some mavic open pro rims, DT Swiss spokes laced to your hubs. If your hubs are shot, get some Shimano hubs.
Just some food for thought.