NES Rf output no sound and no video unless switch is pushed in a little

I got a NES unit that had no working sound in either the RCA and static on the RF. I found a video on youtube that showed someone looking at the schematic seeing the reliance on the Q5 transistor for RCA sound. His Q5 transistor had a corroded leg.

When I opened my RF module I found that transistor also had a corroded leg. I replaced the transistor and recapped the RF and mainboard since I was already in there. Upon testing RCA audio and video work perfectly. But using the RF adapter had no signal at all. Playing around with the channel selector switch though, I found pushing the switch in and out affected the signal, and in a certain point the video works perfectly. Sound remains static no matter picture quality though. I could easily just leave the console and stick to the super RCA cables, but for the sake of learning I'd like to fix it.

How would you guys proceed to repairing the RF port switch and audio? I don't see replacement ports readily available.