I'm working my way through TNG now. I recently watched 'The Measure of a Man' and I can't help but feel this is TNG's way of moving past those undertones shown towards Spock. I thought it was really well handled.
Bar the first three films, Stars Wars is dreadful. Whereas Star Trek was consistently good for years.
I watched a bad episode of TNG over any of the recent Star Wars films.