I can also vouch the stock shafts are far superior than aftermarket ones. I tried a set from Repco and a set from Autobarn, both bound up at the slightest bit of bonnet-rise (I.E torque-rise?). The aftermarket supposed factory-spec shafts are definitely misleading, they are not.
Is it possible your CVs aren't factory ones?
I ended up buying a whole second jeep to salvage the shafts from and although they are 300,000km old they are fine. But when I do my tax return this year I am probably going to put these in as they seem to be the only aftermarket shafts not made cheap from you know where. Also, this is from the US where our WH is the same as their WK in the year range
https://www.rcvperformance.com/ultim...ferential.html