The cure for crossbolt safetys (old skeet shooters trick) is to drill and tap the trigger guard, and put a set screw in to hold it in the off position.
Well that makes sense, and I can do that kind of work but I hate to mess with original designs.
I like to be able to bring things back to original.