I ended up finding and buying a yoke and block on eBay for around $45. If the new parts are better than my old ones I can just do a swap, otherwise this will give me the luxury of using the shaper to make and fit a block for the new yoke, then I can do a simple swap. It's worth the $45 to simplify this whole process. Once the parts are made and fit to each other I can do the swap in an afternoon instead of spacing it out over several days/weeks.