Skunk I know with a lot of pistols that offer the safety and decocker that you can switch between them with a parts kit may be worth looking into for you.
Actually I have seen a video (don't know if it's the one you referenced or not) where all you need to do is take the safety levers out, pop out a steel ball and it's a decocker only, and it doesn't void any warranty.
A Little Paranoia Will Keep You Safe (ALPWKYS) Be a Sheepdog JYD#105
