I guess the decision whether to include Amy or not depends on how far I plan to take this -- she does play an important role in season 6 in seducing Willow to the dark side, one might say (incidentally, a more convincing transformation than Anakin's!), but her inclusion would mean also including the episode "Gingerbread" from season 3, where she turns herself into a rat, which would take up a lot of screen time that could be better spent on Mayor-Faith story arc.