Fuel tank is not the same. Due to the difference in width between the frame rails, the tanks are different sizes.

I have seen people fit MC21 swing arms into MC18 frames, so Can't see why one cant go the other direction. Just a question of how much work needs to be done to make it work