Thanks -
re - diagnostic plug housing is faulty.

I cleaned the contacts and screwed back on and was working steady for awhile.
Are you talking about the main round thing that screws in or the receiving part that's mounted to the fender ?
Or is it both the male/female assembly as a whole ?