Have you solved this one?
You clearly have a problem somewhere. You said it was fresh from the shop with a frame-off restoration. Is it truly restored with a full original type harness, switches and lights?
Your symptoms sound like what often happens if you put halogen headlights with a standard switch. The lights require more power than stock, and are too much for the switch to carry.
