Those ideas are great!!
Just so you know, I beleive my players would enjoy a rather straightforward scenario the most. Also, they hardly know Rigulas yet, so constructing challanges around knowledge of his character might not work so well.
And, of course, they should be the ones "in charge" of...