Playing, mating, fighting or all of the above?

[sylvia]

You did the right thing in returning the gourami but I don't think replacing it with an angel was the best course of action as adult, lone, angels get rather nasty in time (mind you so do breeding pairs!) and a 25 gallon is somewhat small for one. It sounds like you're already aware of problems with the other fish so I won't go into it. Basicaly, you will need to up-grade your tank eventualy.