Okay fellas, I've had the cluster out, tweaked the terminals and used dialectric grease, all worked fine for a while.
Now it's gone batshit crazy again.
I popped the two connectors off the metal dash so I could wiggle them a little while plugged in, and it seems to be the right side one with the...