I would suggest one thing right off the bat, rehome the Goldfish. Goldfish with Tropicals in the same is problems waiting to happen. Goldfish produce a lot of urea(Pee) and this is very unhealthy for the Tropicals, especially the Angelfish.