It looks like I hadn't posted in this thread since 2011 and those images are long gone (by Photobucket account). Still have the frame, though it's now definitely built up with different bits. I've gone over it with the "official" refinishing kit to give it a good, even brushed finish, and reapplied the decals and a new headtube badge.

Still the same fork, but I think I'll eventually get the fork they sell so all logos match (the bike and frame were originally a burgundy color, so I'd given the fork a decent rattle can re-spray).

Mismatched wheels, but that's because I have a Powertap hub to swap between bikes. It's probably time to investigate either a crank or pedal-based system.