At a visceral level, I’m still with you on preferring option A, Mala.
I want to have the best possible option for B as well to consider. If B was what we got in theaters, it wouldn’t have stood way out as a problem to me, I think. Poe and Hux act in character in B, and the humor is driven by their personalities without going over the top. If I can get it down to the point of working, that’s probably the better choice.
Would anyone watching option B as a first time audience feel anything was off?