just color the wires with a sharpie and whatever slack is left in the wire put heat shrink on, then when if it starts to rub off you won't have as much to redo. i'm fairly confident in my soldering skillls, but i don't think i'd wanna resolder wires on a servo