Regarding the UJ, I simply laid mine on the bench, gave it a tap on the ends of the pins to tighten them and now it feels as good as new and has done for the last 4-5 years since I refitted it. Why make it more complicated than it needs to be?

You just need to make sure you don't over-tighten it.