I've tried a slightly different approach to soldering switch, especially for the frog - green wire. I actually broke a frog wire of a double slip and it is a very expensive mistake. For now on, instead of having to drill right underneath the frog, I leave more of the bare wire from Peco that runs under the sleeper and I drill right next to the sleeper:
