Prototyping?

Unless you do it in a high-tech company such as Erik's, where they are shy to tear off a pin and use a bigger drop of solder^* :-) your solder gun should be always next to you, hot and smoking; plus a piece of thin insulated wire and a pair of fine pliers.

I mean it. I do the error of too much thinking too often too.

JW


------
* explanation to Erik: you mentioned you had to rerun a board because of XTAL1/XTAL2 were exchanged - this is what I'd do, tear off the offending pin and use more solder to connect the good one, on the prototype