Yes, the X-valve is a drop in replacement for your emag valve. All you need to do is change the pin to the emag pin and install the black quad oring.
The safety has always been an issue with the older grip frames. Install a new spring and ball bearing and keep it well lubed so that it won't rust. Lightly sand the ridges on the safety itself so that the ball bearing can roll over the edges without sticking.
Once you get the trigger area clean, it should pull nice and smooth without much effort. You can control the pull force on the trigger using a combination of magnets and spacers in the frame above the trigger. Adjust the length of the plunger assembly to 3.005" from clevis tip to plunger tip to give maximum pull force for your solenoid. The pull distance for the electronic trigger needs to be adjusted using the set screw in the selector switch. Once your trigger distance is set, adjust your trigger magnet to work in that range. Make sure the distance is long enough to adequately activate and then release the HES switch on every trigger pull and release. Don't install the trigger magnet backwards or the trigger won't work.
Except for the Automag in front, its usually the man behind the equipment that counts.