When I have a problem fish, especially one that has grown up
and developed a problem I take those to the LFS and let them rehome it. I know the bird is your favorite fish and the yellow is fighting with it so I would get rid of at least one of those fishes to establish peace back home. I don't like watching fish fight either and some fish just have a mean streak that causes them to be warriors 24/7 as they grow. Give it away and hopefully someone with a large agressive tank will take it in and it will have to learn to behave in the new ocean home. It gives the fish a chance at happiness that it isn't finding in your tank, sorry.
otherwise you are just going to have to learn to enjoy the battle.