If the 216 is running good you would be crazy to swap out anything. If it is a mess than going with a 54 or newer 235 or 261 would be a great swap.

The same goes for your driveline IMO.


54 3100 with 235
62 flatbed dump C60 with 261