Are you talking about scratchy, staticy noise as you turn the knobs? that sounds like bad potentiometers. You can get replacement pots at http://www.allparts.com/
Or any electronics/radio supply shop.
You can get the same value pots as what you have, or switch to a 1Meg (instead of 500k) one for the volume pot, that'll give you a little more top end. You'll also want a audio taper for the volume pot, doesn't matter as much for the tone one, but I prefer linear for the tone. Tone ones are generally 250K I think. If you have a digital multimeter you can measure the ones you have to be sure.
I'd leave the topology of the circuit alone (i.e. just pull off one wire at a time from the old pot and solder to the same pin on the new pot)
I wish my lawn was Emo so it'd cut itself.