Hello Kim...
I just recently responded to a very similar question here: Assign Quizzes. Unfortunately, you'll have to go the route that you've described...but assigning quizzes to individual students or sections. Please also see this discussion topic from a while back: How can I assign a quiz to a group?. Sorry that I don't have better news for you at this time, Kim.
