Agreed on trimming “little sister”, I thought that too. Baze and Chirrut were only lightly developed characters in what was an ensemble movie, but as a continuation of Andor they’re arguably even more minor, and the implication that this relationship has any meat to it is more distracting than cute.
I’d keep the Vader content though, Andor’s now transitioning towards the Original Trilogy so more Tarkin and Vader I think is important at this point for continuity flow.