I done my rewiring myself buying seperate bits as required, so can't comment on the wiring kits.
Headlights, depends if your staying more OEM or more modern led etc, searching for 7" headlight on ebay brings up plenty of choice.
Did you see John Palmers lights in his grey car?
I would suggest tho, if you want it to look more standard but with better light output, buy units that have a modern rear reflector with plain glass, as the genuine originals with the lense/focusing aspect on the glass with a plain reflector can't hold a candle, pun intended to the alternate ones!