21 crank webs are 2mm bigger than the 18. so the cranks aren't interchangable.pistos etc are same . send new pistons away with your barrels if you need them replated and they'll match them to the 18 barrels you have.
with the kits it's just the head gaskets that are different.