sorry i didnt realy sumarise
your final sentece says it all for me. yes i think its an inner cv joint.
get undernieth and check both for play and the condition of the gatters. if ones leaking grease everywhere then it'll be that one mate.
hope that cures it mate.