Thanks for the quick responses guys.
Griff, thanks for the links.
The only reason I discounted the UJs is that it doesnt rattle when driving or using the engine to brake. Just when changing gear. I'll have a gander at the UJs when opportunity presents itself though.
I haven't had it long enough...