Ah. My only suggestion then would be to reduce the likelihood of errors by just combining each pair of black wires with its yellow wire, so it’s one continuous wire. It could still follow the same route and keep your main section less crowded, but there’d be fewer connections to worry about. And you could hold them there with little jumpers like you did in the top right section.