If I were the programmer I would leave the last weapon stacked for sprites and this kind of stuff. The override of the abilities would look natural this way and the only thing that would need to be done is increasing the attack (probably just a variable and a flag to worry about).
