Mate, I'd be disconnecting and cleaning every electrical connection in the headlight circuit. Throw in a visual inspection to look for terminals that might not be making full contact due to being spread too far open. It's not the physical connector block per-se, its the wiring inside that is the potential issue.

__________________
Cheers,

Anthony