If C2-N2 is going to be weapon-less then can we add a skill to him that turns on/off his melee AI or simply turn it off, he is a decent healing option, however his punching is quite unnecessary.

If he cannot equip a weapon then there should be an ability to allow him to heal but not falcon punch. Otherwise why can you even summon him...