Just a personal thing but I prefer not to use a swivel anywhere on a load bearing part of the rig unless on the very rare occasion I use a pulley rig.
Gemini rig clip at the end of my shockleader and a small oval split ring at the top of my rig, safe, secure and can change rigs over in seconds when double patting.