I think the front one from a SP2/WC fits straight into the X1CR. I will check and confirm next time I have it apart.
I found the drive cups would also wear, They look ok looking from the outside but look into the cup from the end and you may see that they are worn deeper in the slot.