Last time I watched TLJ I had the thought of just removing Poe’s x wing getting damaged in the first place therefore no bb8 fixing it? I mean it never comes up again. Just have him run through and take out the guns, then it’s all about the bombers like in the theatrical.
That seems so simple I don’t know why it hasn’t been discussed already. Just cut out Poe’s X-Wing getting damaged and there’s no need for BB-8 to have to fix anything.