Yes the description I gave is the way to go , as for the shaft/axle I would still hold off until you pull it apart it can't hurt to leave the old part in place because as I said mine was perfect even though the spline was buggered . Which guy told you about the axle needing to be done at the same time ?