Stock tone control for '85 Fender J (MIJ)?

I searched high and low but for some reason was unable to find a clear answer on here (although I have to believe it's been covered to death).

I have a very nice '85 Fender J, MIJ. The previous owner had replaced the tone control with an EMG active, stack pot pre-amp. Since I already have the 'active' thing covered with my Ibanez, I'm toying with the idea of taking out the EMG (it's a p.i.t.a. to take the entire control plate off to replace the battery) and converting the bass back to passive. To that end, what are you're recommendations for a good quality replacement single knob tone control? Doesn't have to be a stock Fender product necessarily, but something high quality that would basically just drop right in?

Also, is this a good time to replace the capacitor with an orange drop?

 

K, thanks.