While my boat has been on the hard, my halyard turning blocks were "liberated" by a thief. I will need to replace them before launch. My '85 C36TR has the pinned mast collar setup.

I am currently looking at these two options from Catalina Direct:

1. F8107: Standard replacement block
2. T2087: Ball-bearing/Heavy-duty version

Has anyone recently replaced theirs? I’ve reviewed the two forum discussions below, but I’m looking for updated advice/feedback on whether to stick with these CD parts (one is up-sized from OEM) or if there's a better third-party alternative that fits the pinned collar better. If I call Garhauer directly, will they know which CD parts I'm asking about, since their site's version of the "30-13" Lou mentioned in his post differs from the CD part with the "upside down standard shackle?"

Forum references already reviewed:

1. Technical Discussion: Mainsheet Blocks
2. Halyard Blocks on 1986 MkI

Any insights on fitment or performance would be greatly appreciated.