Wiring help please

How about after you've finished repairing the wiring, you plug it all back into where they need to be plugged. Then group them together neatly into bundles, taping them only at the branches. Then remove the harness again and properly wrap it with the non-stick tape. Reinstall one last time and "Bob's your uncle".