I think you should have Sam learn a bit of Close Combat, not too much since I don't want him to me a magic swordsman or something or a jack of all trades but just a bit.
Like maybe be able to make a sword out of aura, water or use his staff just to know the bare minimum
