I just purchased a 1985 cj7 w/ a 4cyl. and Im looking to swap out this motor for either a straight 6 or a amc 304. I would like to know which motor will bolt right in w/ the existing equipt. I have Trans etc. It has a hyd. clutch and a 4 spd man. trans. Any help would be appreciated.