Just a quick update.
Today after work I took some time to buy a new wire crimper and some 12 gauge wire. I spent my evening measuring cutting and crimping and these are the results. I have my fingers crossed hoping I did this right!
Adapters were provided by www.easternbeaver.com.