The headlight switch I bought came with that metal plate thing that the other switches connect to - http://www.paddockspares.com/stc439-indicator-horn-headlamp-dip-switch-ha455946-to-va104805.html
Definitely better now, but there's still a flicker on the bigger road bumps.
However, what is...