If the guage lights are giving you trouble, have you checked the headlight switch? I seem to recall they could adjust the brightness/dimness of the gauge lights by twisting it.

I also seem to recall they seldom worked well or for long.