Why not just drop the front driveshaft and look at the splines? Regardless of what you decide, the first step is diagnosis. Don't order any parts until you know what you are working on.

__________________
2007 X3 3.0si, 6 MT, Premium, White

Retired:
2008 535i, 6 MT, M Sport, Premium, Space Grey
2003 X5 3.0 Steptronic, Premium, Titanium Silver
2002 325xi 5 MT, Steel Grey
2004 Z4 3.0 Premium, Sport, SMG, Maldives Blue