christmas might’ve just come early ! #wecannegotiate
fwiw: i’d ideally replace both Level knobs and both Volume knobs (dotted) for the OT and AF respectively, so only the Encoders were grey on both (i’m analog that way) and i would want to square you up for that - however, anything which helps solve the problem, be it 1 or 2 plain encoders, is a welcome bit of hope 
in all seriousness, it’d be no good for you to end up with an incomplete part set that you couldn’t shift on !!