I always like the Black Cherry. My vote would be to repaint it, replace the current parts and pick up a new Waterford. Two bikes are always better than one.
__________________
84 Bridgestone 400. 90's Basso Highway, 07 Rivendell AHH, 16 Clockwork All-Rounder , 22 Rivendell Roadini