I think “The Plan” is well done, but the Supremacy infiltration is so truncated because of cutting around DJ that it’s a bit confusing.

Is it possible to keep DJ as the code breaker (as 4throck suggested) so you can use more of the Supremacy material to flesh this out? Using more of the deleted scenes could help too. The segment where the officer is following them towards the elevator is actually pretty tense. I wouldn’t use the goofy bit on the elevator itself, though (with the Tom Hardy cameo).

Personally, I don’t think Canto Bight needs to be completely cut, but if it’s a dealbreaker for you, I think it’s a great idea to keep the infiltration. I wish they had made a more focused effort on this part of the plot, because it’s a fun idea, and with Finn there were many opportunities for real tension.

I’m interested to see where you go with this!