looks excellent Steve, I love the way you labelled the wires, avoids confusion.
I need to rewire mine so will use your approach.
Very tidy job indeed. Are you going to copper shield the cavities ? could lower the hum and interference.
Also glad I saw a Heineken stubbie on the workbench.