i say stick with the M, because if you swap the motor you will have to go through the smog referee from what i understand and i hear that they are jerks sometimes.