Decided to take the time to reroute the whole thing. Originally, it was for aesthetics and maintainability, but then an hour in, I realised I’d forgotten to connect SW7 and had to restart. Realised that the “optimal” layout was concentric traces corresponding to switch numbers in descending order. Still have a bit more to do but that’s in terms of proximity of the tracks but decided that this was enough for the day.