I had a thought about basically working with him with a staff, since he's already familiar with how his stick thing works. It wouldn't be much of a shift and he could apply the knowledge with his actual stick if he needed to - that thing's metal. It hurts when he whacks you with it.