Sounds like you're headed in the right direction removing fish. Earlier you said the 'trates were high. It's the fish count I'm sure. I'm thinking you care, and was VERY excited about your tank. I've been there - just not to the extent you are.
Anyway. sounds like you've weathered the AA storm pretty well so far and are making the right moves.
2 tangs in that tank is the limit IMO
. Maybe also remove the puffer, butterfly, and one (or both of the angels. Feed only once daily (maybe even every other day). If you've got coral, butterflys and angels may become a problem. Also agression issues will surface, thereby stressing fish out becuase of the lack of "territory" as they get bigger or more used to their new home.
Good luck and happy hunting!