Welp, here I go again. Parts in or on the way!

I hang my head in wishing it were true here LOL
For the cost of a couple spares, I'd just stock them Myself if that's an issue, but if the shaft is being shortened w/a new end I guess that yoke swap'd make sense for the same $$$.