If it were me it would depend on budget. And since I never have bike money. I would cannibalize. Then if I felt like the Waterford deserved a higher tier group than the 2nd tier group offered by Shimano (the general consensus here). I'd sell the frame and use the money towards that. However that tricolor group is some dependable robust stuff and you may decide to let it ride and use the money on something else.