looks like the m20 one will work fine, though its hard to tell exacly as their end cases are different. You might want to to take the motor of the starter off so you can spin the gears then set the starter in the bellhousing and spin it to make sure they dont touch, thats what im going to do.
let us know when you get it bolted up