One option is to get the Cardone or other replaceent shaft(s) and use them. Take off the old factory units and while they are out, take your time and replace the boots and re-grease on the bench. If the new shaft(s) have issues down the road, you have the original factory shaft(s) to reinstall. I was going to keep mine, but looked at the surfaces where the seal wipes and saw some wear, so decided not to keep them.

__________________
2003 X5 Sport w/Premium Package M54 3.0L 6cyl