Hi Monsta-Tone,
Wow I didn't get a notice of your post. I had the same idea you had about using a lower gain preamp tube. It turns out there was nothing wrong with the EQ, it just caused the bad EL84 to act up worse.
I'm not sure what kind of tubes to get, the Fender Chinese tubes sound...