Front driveshafts (ANH20)

So ive had an annoying knocking over bumps since picking up the car, this weekend I figured I'd have a proper look, I had considered (and bought replacements) for the PAS motor damper and droplinks, I installed these over the weekend but noticed that I have sone rotational and up/down slop in the joints for both sides, but more so on the passengers side (short shaft)

Looking around it seems really difficult to find new replacements other than a site called "J&R CV joints" but the reviews for this company are generally terrible.

Would anyone have any recommendations of where I can source replacements or if j&r are worth the risk?

Considered some used shafts from a breakers but none of the ones that have them are willing to show me the condition prior to paying 😅