Should solder every joint and when two wires are connected use butt connectors with solder and heat shrink. If you do this you will be less likely to have an electrical problem somewhere in the boonies at night on the weekend without a flashlight. I used the worst scenario.
Also with you having turn signals and extra wires etc. I assume you have a generic wiring kit. You may have more wires to connect than the original terminal blocks allow. I bought my blocks from Nappa. They look neater, have more contacts, and are covered.
I don't remember the part number but I will post a pic Tuesday or Wednesday. I'm out of town until then.
