I believe so. Look at the two links from your post and pay attention to how the second link shows the female connector basically being flat on one end while the first link has a little lip there. I used the connectors from your first link when I rebuilt my bulkhead and everything worked out fine.
The connectors from your second link look like the connectors from your headlight switch pictures. They don't have the lip on the end. That lip could potentially cause the connector to not seat correctly so I wouldn't use the style from the first link on your headlight switch.