Something that does confuse me about that wiring diagram is that i've got a wire coming from the volume pot that is already soldered that's meant to go to the 3-way switch but it has both a hot wire and a ground wire,
Photo?
I'm stiil working on my first cup of coffee, having trouble picturing what you mean .