alabaster
Fish Crazy
So what exactly do you have in the 30g tank right now? Didn't mean to sound rude in my last but it sounded like you were heavily overstocked already and wanted to add 2 angelfish.
It seems now that that may not be the case. If you are able to get rid of one type of schooling fish, consider doing something like this:
30 gallon setup
0 long-finned danios (get rid of the 2 you have, just a suggestion)
4 black phantom tetras
6 neon tetras
3 african dwarf frogs
4 rasboros
1 angelfish
But consider that when the angelfish approaches full size, it WILL eat the neon tetras. Guaranteed. If you could put the neons in another tank, I'd do this (keep in mind that this is only a suggestion):
6-8 black phantom tetras
4 long-finned danios
4 rasboras (what kind are they by the way?)
3 african dwarf frogs
1-2 angelfish (unless you are way overfiltered only get one angel)
Hope this helps, but they are only what I'd do if I were you, and since I'm not, just consider my ideas and do what you feel is best. But make sure you don't overstock, as it can kill your fish quickly and easily. Good luck!

It seems now that that may not be the case. If you are able to get rid of one type of schooling fish, consider doing something like this:
30 gallon setup
0 long-finned danios (get rid of the 2 you have, just a suggestion)
4 black phantom tetras
6 neon tetras
3 african dwarf frogs
4 rasboros
1 angelfish
But consider that when the angelfish approaches full size, it WILL eat the neon tetras. Guaranteed. If you could put the neons in another tank, I'd do this (keep in mind that this is only a suggestion):
6-8 black phantom tetras
4 long-finned danios
4 rasboras (what kind are they by the way?)
3 african dwarf frogs
1-2 angelfish (unless you are way overfiltered only get one angel)
Hope this helps, but they are only what I'd do if I were you, and since I'm not, just consider my ideas and do what you feel is best. But make sure you don't overstock, as it can kill your fish quickly and easily. Good luck!