I hope nobody minds that I post my suggestions although I have no time to participate:
@ Blink:
You could start a thread to collect riddles which fit with your story, if you don't find enough time to develop these on your own.
Just a thought.