1. You could also add a warning AFTER destroying the handle and the blade to say "The blade's gone now. I hope I don't need it again."
3. I think the riddle's okay, but the wording of the riddle could be clearer, perhaps somehow referring back to the hint originally given to you by the old man.