Rainbow colored ribbon cables help with keeping it under control, but sometimes it's just easier to change the Arduino program to match the connections
. I'll post the full wiring diagrams when they're done. I'm glad I've documented everything since the beginning now that I've taken everything apart and started rebuilding it.
I put a cheap 5$ servo in as the gear servo, but apparently never actually tested it. Today I've spent most of the day troubleshooting and ended up swapping it out, because it's got full right deflection as the internal center position. No way to trim that out. Never seen that before. Again, the lesson (still not) learned is to test everything properly before building a truck around it.