I’m in sort of a similar boat. I have a 2007 Cervelo P2C that I love, but I’m torn between making a major investment in new race wheels for it (disc/80) or save my money and get a new disc TT bike. A huge spend on wheels will get me a couple more years of use, but then I’m left with wheels that won’t transfer over to any new (disc brake) frame.