If you do just pull frames from a full hive as you need them for the observation hive, I would leave the queen in the hive. Having a queen in an OB already is one thing, but putting frames in an OB and then moving it around has the potential for shifting frames, and damaged queens.
You can always mark a few drones, and have the kids pick out the "boy" bees.