My rule of thumb (which may be overly simplistic) is that if the clicking sounds during deceleration, it's CVs. If it happens during acceleration, it's U-joints.
BTW - wear patterns on the races is to be expected but I have no idea how much is acceptable.
That was sort of my thinking as well, however, I dont see any U joints on the front drive shaft.?. At least the kind I am used to, there are two coupling points but no u joints. Rear U joints yes. So thats why I am nervous about the front end being blown.