depends on budget and the look you are going for
if you have the $$
I would get a full group 105/ultegra from a UK bike shop then you have the best of both classic frame and modern shifting and breaking
other wise swap
__________________
Life is too short not to ride the best bike you have, as much as you can.