I haven't had a chance to read the script, and won't until tonight at the earliest, but I had a thought Re: The Bothan Spies intro

So, other than the obvious problem of filming an entirely new intro sequence featuring the adventures of several actors in Bothan costumes, with props, blue screens, stormtroopers and more, there's the story problem of none of the main characters being present. This is a particularly difficult problem to overcome because we can really only film masked characters.

But what if Leia, in the Boushh armor, was part of the operation? By introducing Boushh early on as part of the Rebel Spy operation, the viewer will already consider Boushh a separate character, making the Leia-reveal more surprising. It doesn't resolve the "No Main Characters" problem for the first viewing, but it fixes it on subsequent viewings. It also gives us a new way to see Leia as a fighter, which I suppose is always good?

Boushh's final appearance in that sequence could involve getting into some sort of personal ship, receiving a message and looking at a hologram/photo of the Falcon parked on Tatooine. Hopefully aspersions could be cast on the character during the Bothan Operation scene, causing the audience to doubt Boushh's allegiance. The word "Bounty Hunter" could be used. On first view, the viewer should think "Oh no, this creepy bounty hunter has found the Falcon!", a thought which will be completed when he appears with Chewie. On second view, the viewer will know that Leia has been contacted and told where to meet Lando & Co.