I finished up the bulk of the wiring and swapped in the 6-speed pedal set.  There were a few other odds and ends that needed replacing which I will detail when I detail some of the specifics of the swap.

A proper pedal arrangement.