I'd say the Skeledirge version is probably best suited for the current metagame based on my limited experience. One thing you might want to try is Vaporeon, it's the highest HP wishpasser in the metagame and I feel like it might work well with Scovillain especially given its low HP. Depends on whether you've had an issue with it dying though. Could maybe try Glowking + Vaporeon over Clef Pex.