If you are not concerned with originality, do what I did and replace those bullet type connectors with a male/female spade and solder, especially in the heavier gauge wires.
On the smaller gauges you can find generic connectors for what's left.

You can stagger the lengths to make a neater bunch, much better solution to the OEM set-up, IMHO.

Joe