Hmmm, turns out I'm not quite done yet...
When i turn up the tone pot (i.e. to a brighter setting) I'm getting a lot of noise, which disappears completely when the knob is at its other extreme. Any suggestions?