I am definitely in category of “Movie canon” and making sure the audience is understanding the ideas. I personally hate introducing outside material … especially from sources that have a lot of corn in it. (Like Rebels)
Unfortunately this may not be the movie we wanted, but gotta go with what is really feasible to achieve. Even if it is trying to shave off as much corn/fat/dum dum, etc.