Or just rebuild the M21 as an M20. Input shaft, cluster and 3rd gear. They normally need a kit in them before they are used anyway.