Looking over the TNG eps on Netflix, it occurs to me that "Hero Worship" might work with Spock rescuing an orphaned boy from a stricken vessel, who then decides he's "Vulcan" to suppress his feelings.
The difference, of course, is that Data wants to be more human, while Spock wants the opposite, so coaxing the kid towards facing his emotions might be odd.
The ending where Timothy thinks he destroyed the ship, but we find out it was their own shields could pretty much work as it did.