I woulda split it into two movies. Make the first movie about finding Luke, throwing in hints about a imminent super weapon the First Order is building, and then have it come out of nowhere in the last five minutes, blow up a important New Republic Military shipyard or whatever, bam, credits roll.