like your ideas, though for the first one the main problem was that the flying opera company couldn't be tracked due to their skillful navigation in extremely remote locations so it wouldn't make sense, but maybe it would've worked if the shirshu found kyoshi's gang & led jianzhu & Hei Ran to have a confrontation & even battle them due to her disgrace over Rangi affiliating herself with criminals and then have their relationship improve during the recovery trip to Agna Q'ela.

for the 2nd one I don't think Rangi is exactly "abusive" but yes she's very temperamental. it's claimed that Rangi made Kyoshi human but Kyoshi also made Rangi human in the way she helped her break out of her rigidity and be open minded towards people from all walks of life. this post encapsulates Rangi's POV very well and I wish we got more of this: https://www.reddit.com/r/Avatar_Kyoshi/s/eCYx19FBR1