so i just add a wire at a time to the schematic, propagate it to the layout, and make sure that it matches the existing traces. if there is any ambiguity, i just move on to the next trace. eventually i use a process of logical deduction to resolve that.
here's the board in KiCad. there's only one little problem now...