MC18 has hexagon shaped cylinders.
MC21 has round shaped cylinders.
I've always liked your type of MC18. Will have to get one at some point!
From what I've been told the '18 doesn't use a gear position switch. I guess you've already checked the wiring diagrams?