yes,
you'll have to make jumpers
my kit came with spare lengths of wires

purple, blue and orange. and connectors.
I have not seen the column clip for sale, but i haven't looked either. try posting in the parts wanted section,

I would pull the bearing mast and check the condition of the wire. Or at least do a continuity check with a meter.