I'm quite sure that any pan shaped scanners from the -2's on are the same, also in M-2, M-3, and M-100. To my surprise, I even found a pan scanner in a T series organ (TTR-100) with self starting motor, installed here at the TWG's opposite side.
Weak wax paper capacitors at the vibrato line also are a possible cause for a chopping vibrato. I'd replace them first.
Best regards!
Uwe Menrath