Well, it turns out that I didn't do my homework for
"These Aren't the Droids for Which You're Looking." As noted
here, the Imperial Remnant wasn't consolidated to the Outer Rim until 13 ABY, and the New Republic was declared only a month after the Battle of Endor, meaning that the heroes shouldn't be called Rebels anymore.
Meanwhile, I'm working on more surprises, but it's still mostly combat. I've also found a name for each encounter that's a quote from the movies-six from A New Hope and two from Return of the Jedi, I believe.
Irregular Webcomic! was indispensable for this purpose, as it's written out and a lot quicker than watching the movies.