One way to rig the upper swivel. Notice he did away with the pigtail by using a marine eye on the stay, & a stamped shackle to connect the block required to hoist the jib.
See the sister clip,(bottom right) used to remove the extra halyard after the jib is raised.
Also note how he connected the swivel to the mast hound, via a shackle that fits INSIDE the swivel jaw. I'm not sure if he hammered a standard U shackle to fit, or if this part can be purchased.