Might be too much work, but since Zorri wears a mask the whole time, we could redub her to fit whatever new narrative we wanted. For example, we could have her say Poe was just working as a spice runner undercover for the Republic, which is why Zorri is so pissed off at Poe (and would help alleviate some of the stereotype issues of making the Latino character a former drug runner.)

When Poe asks how long Kijimi has been like this, she could say not long after Crait or Skywalker. And when Poe starts getting down in the dumps about people losing hope, Zorri could tell him that these people have actually regained hope and are resisting.

And I don’t think the mask has to be perfect MR. Once we have puppets there, it’ll probably distract from any imperfections. Plus, it’s such a short shot anyway.