The 21 will require many more upgrades to deal with the power for a very long time. I'd go with the 3.3. Installing 10 slipper pegs (or the 3.3 slipper/spur conversion), the FOC inside the trans is about all you would need to do for durability. Then a new pipe to let it breath.