Yes, the questionnaire add-on seems to be just what you need to use. I hope you are using a very recent version of Moodle, (at least 2.6) to benefit from the features recently added to Questionnaire. For further questions about that module, please post to the Questionnaire forum.
Joseph