I thought of one more thing that you should do whether you go back with the 216 or you upgrade to the 235. These engines have a fiber timing gear. If you are rebuilding the engine make sure you change out the timing gear set to keep you from being stranded somewhere when it fails.
