Thanks for all the advice, guys.
I think I'll desolder everything, or most of the wires, and start from scratch. I'm tempted to just hand the guitar over to a tech, but I want to be able to do wiring myself so I'll have to bite down hard and get back in the ring with another go.
I find the wires from the pickup switch a bit confusing as they're kept together inside a "wire tube". Isn't it quite simple to replace these wires with new ones? I'm thinking it would be easy if I just did one at a time. Am i wrong here?
the tone controls are easy to diagnose (as are the spare wires). you need to wire the left had lug straight to the back of the pot
If I'm getting this right one of the tone pots' lugs should be soldered to the back of the pot like on a volume pot?