Had the same problem. My shaft has 29 splines + 2 wide ones. I order 4 shafts from 3 different places and none were correct. I finally found one on ebay that's the correct number of splines. Car has been on the stands for 2 weeks now. Finally get to put it back together today.
https://www.ebay.com/itm/204601949142
https://www.ebay.com/itm/204601949142