Freelander 2 (LR2) CV shaft issue

Good evening all. I've got an issue replacing the RH drive shaft/CV shaft on my FL2. I'm replacing the whole thing but I've got an issue that mayor may not be resolved tomorrow.
Leaving aside the reliabilty/false economy of using 3rd party parts, here's the issue:
The replacement part fits but the inboard splined section of shaft is too long. Once in place (where it won't push in any further) the bearing on the shaft is approx 20mm away from mating with its carrier. Having measured the one that I removed, this end (new part) of the assembly is too long by the same 20mm.
I have tried to find a tech drawing of the shaft but can't see one, however I have found several other suppliers selling the same item who display a tech drawing (of a fashion) and none of theirs match the shaft that I have removed. In other words they all concur with the replacement part and not the original.
I am unaware of any major works on the car, therefore I assume that all parts are "as fitted" during initial assembly.
Does anyone have any knowledge of any changes in the parts (I'm guessing during manufacture) where my vehicle may have received parts that are/were for something else?

There was a similar issue on the Freelander 2 forum recently. The poster found that the aftermarket shafts were too long, so ended up buying a good second hand shaft instead.
I believe there are several different shafts, which depend on engine and or gearbox type.
Contact someone like Advanced Factors in Southampton, who will know what part fits what vehicle.

Thanks Nodge. I await tomorrow's replacement with baited breath....

Sounds like this...

Ahh, see you've found it.

Replacement shaft was correct length. Original replacement was a BG Automotive brand (too long), the replacement replacement was Apec branded.
From my original I measure 522mm (+/_ 1mm) from the inboard end of the shaft to the centre of the carrier bearing.
Thanks for your help Nodge / GrumpyGel