Yes. With the wire I ran into the cab I put a weatherpack connector inline near the bulkhead connector. You can use any type connector you have available. The reason for the connector is simple, if the dash has to come out just unplug the connector instead of cutting the wire. I placed it near the bulkhead as a reminder.
As for the plug at the headlight switch, I have not been able to source one. I am using a rocker switch for now. The green light on the headlight switch will still illuminate. Hope this helps.