Nigel, on the question of CV joints. Several years ago I replaced my shafts with CV joints at both ends. I have had the gaiter on the inner CV joint fail twice (same side). I don’t know why it fails, nor why the other one doesn’t. If I was doing the job again, I would probably go for shafts with just the outer CV joints and retain the inner UJ and spline arrangement because it is easier to grease that than change the gaiter.
Chris
Chris