Thanks for the tips.
I'm not actually sure the uppers need replacing as never had any issues with them, but they are original so almost 15 years old.
I'm planning on removing the whole assembly and deoxidising, as quite a few threads and bolts are rusty, so will get everything clean first...