This is why we need them to ditch the "there's only a handful of lightsabers" stuff for the next trilogy.2015 - Force Awakens
2016 - Rogue One
2017 - Last Jedi
2018 - Solo
Its over saturating the Star Wars brand.
What you will run into is "Joe Normal" public will eventually say "fuck, I've seen enough Star Wars, I'm good for a while". The hardcore will go every time, but you can't guarantee $600 mill+ WW on that and SW also doesn't have the hold in China where there's no nostalgia bump for the brand and quite frankly lightsaber battles are quaint and dull compared to the types of action in other film properties nowadays.
That or go full-on into KOTOR and such. I feel like the Prequel-era made today would be really popular with a bunch of different Jedi characters for people to attach to. But since that's already set in-stone KOTOR is the best spot for them to mess with.