Something sticks in my head that the cabin-top winch is a size 6 and the jib winches are 7's, for what that's worth.
I also have mounting pads with aluminum plates in them for turning blocks, in case you need to add those. Depending on what future upgrades you might be considering, you might want to use the ones for 4 lines instead of just 2 for the halyards you have now, I have to replace mine if I make any upgrades beyond what I have. (I also need a winning lottery ticket do that. ;-)