I know how you feel. I bought a used Cervelo P2 a year or two back and once I got it sorted out, at least sorted for that time, it was faster than my Shiv. For other reasons, I've been spending more time and focus on the Shiv in the last year and gotten it pretty well dialed in to where it was comparable to the P2. However, just this last weekend I swapped out the 170mm cranks in the P2 with 165mm. I also replaced the stem with a longer one that should allow me to open up my torso a little bit more, changed my seat height and a few other tweaks. Hoping the weather cooperates on Sunday so I can take it out for a 30-ish mile test ride and see where I am now.