I´m fine with that. I went the same route myself.
Also, I´d definitely draw a line between the movies and EU material like games. Of course, EU stuff like the comics probably conform more to the movies than anything else, but I believe the X-Wing game series is a fine benchmark. Playing X-Wing Alliance right now myself!