Drive shaft noise

Hi all,

Last month my car went in for an MOT. The tester noted that both front CV joints were showing signs of grease leakage, with evidence on the wishbones. This surprised me as the CV boots were replaced around 2 years ago and visually, they appear to be in good condition – no cracks or tears that I can see.

A few days ago, I started hearing clicking noises when turning right at low speed from the drivers side

The sound is intermittent, not very loud, and only happens occasionally on right-hand turns.

Given this, I have a few questions:

Since the CV boots appear intact, can I just repack them with grease and refit the clamps?
Or does the clicking noise mean the CV joint is already damaged?
If the issue is on the outer CV joint, is it possible to replace just the outer part, or is a full driveshaft replacement the better option?

Any advice or experience would be greatly appreciated.

Thanks in advance!