Well, I was going to swap for the 235 because Ive heard that is the easiest/smoothest fit.

Is there another engine that fits as easily?

If not, what is needed to swap the 216 with the 235?