Well, Mori will have more to emote once his troublemaking counterpart enters the scene. Tamaki and Haruhi are basically already a couple, so making them NPC would be for the best.