Funny you should say that, because the ne xt suggestion would be to ditch the Act 2 merc in favor of an Act 1 merc. Problems with survivability? My girl Kyoko’s got always Piercing Freezing Arrows for crowd control and Inner Sight that turns Baal into the broadside of a barn.
But you have to be careful pouncing on enemies with Dragon Flight with her.