I think there are some changes that could be made to make the current system better, but I agree with the OP. The armory system and physical levels need to stay.