Well, if the dismantling was surprisingly easy, the rebuild has been a pain, but mainly my fault. Several silly mistakes made, probably due to having too many other issues on my mind π₯Ί But got there in the end and at least the UJ caps aren't moving now. Just completed a test drive with the hood up, so I could anything untoward. The original noise has gone, (although there might be a new one), nothing broke or fell off and the trunnion was just very slightly warm when I got back.
I will test further tomorrow π