After all the recent work I still have a knocking/rattling noise from the O/S/F corner, I'm starting to think it CV joint problem, although not sure if it's inner or outer.

Anyone changed the inner before? as O/S/F is a 2 piece shaft, or should I just buy a full shaft?

Any ideas on prices? prefer genuine parts as trade club discount is great.