Sorry to see it go but there's nothing worse than trying to find a problem in wiring "that just grew".
You've read the advice here before but different colors for different functions and labels wouldn't hurt.
We'll be looking forward to the new and improved--