Yeah I'd defo have a look at the cv boots for leaks and go from there mate
If I remember correctly(probably not) if its already clicking and being noisy then a cv boot kit won't repair it, the cv joint will have to be replaced. I'm sure someone will correct me if I'm wrong.
I changed the whole n/s driveshaft with brand new when mine played up. Quite expensive.
You can pick up second hand ones off eBay for quite cheap, id contact the seller before asking what condition it's in etc, check the boots are in good nick in the pics.
Hope that helps mate