For Bao, my favoured fix for them was always a new skill that would let them make a roll against DTWs with their BS weapons. That's a sufficiently valuable skill that it could carry their whole bloated profile; being the one close-quarters LI in the game that Chain Rifle/Smoke troops can't easily beat at close range would allow them some very useful and unique roles during active and reactive. As for Frenzy, remove it and trade it for Impetuous. Cuts down a little bookkeeping. If you're going to be idiotically angry may as well go all the way.