I’ve made some more progress on the edit over the past few days, mostly incremental progress and tightening up transitions but some actual new changes.
One change that has proven oddly difficult is removing BB-8’s mention of the Ileenium system. In the original, Han decides to go to Maz’s place because the Falcon is too easily tracked, yet they eventually take it to the Resistance base and to Luke’s island anyway. Removing our heroes’ knowledge of the Ileenium system also makes Han’s assistance necessary. But anyway, I’ve tried about everything and still can’t find a seamless way of skipping that information. Maybe it will require cutting the entire exchange.