Hi Patman83,
I suggest solution 1 (pad diameter 1.6mm) Eagle uses a standard setting of 1.6002mm and a drill size of 0.8128mm (reduced to about 0.8mm after copper plating the through holes).
Connectors should fit through the drill hole and space between pads allows for a 0.4046mm trace to be "thrown" between them.
You will have problems with a pad diameter of 1.8mm getting traces between pads (if necessary). (For pad to trace minimum clearance the allowable trace width will be reduced to 0.1322mm.)
Boncuk