Just a quick update.
I have repaired my Leaf (a couple of months ago now) by swapping the gearbox for a low mileage second hand one, and this has definitely cured the noise.
While it took me a few days, I was able to do the job by myself on my driveway with some careful planning and purchasing...