A quick check at Divinikey shows the 7305s are wider. Those may work better. If anything, I’ve always had the opposite problem with the pcb holes being too small.

For mounting, I always have some new cheap switches I put the sockets on and mount a few of the switches at a time to solder the sockets in. That way if I mess up and get solder inside the socket with the pin, I can just throw the switch away.