I had a thought about the short story : what if the mystery is the motive, not the villain? It seems that if I move the pieces of the story around in a different way, then the question changes from Who? to Did he really do it?
Sounds like a fun exercise for this evening!