Although I'm a fan of both franchises, I am definitely more of a Trekkie. Star Trek has always been ahead of Star Wars in its diversity, and has had a deeper impact on current society.
A few months ago, we had the privilege of seeing Nichele Nichols at what was billed as her last public appearance, at LA ComicCon. Nichols was not content with breaking barriers in the imagined future. She challenged NASA to to bring more women and people of color into the present-day space program. So NASA contracted with her to do just that. We saw the result of that effort in person at the Convention: Rocket scientists, astronauts, engineers, astrophysicists and many more were there to thank Nichols for inspiring (or in some cases personally recruiting) them to pursue these careers.
So let us follow the Vulcan philosophy of IDIC - Infinite Diversity in Infinite Combinations.