Help Sorting Out My Tanks.

[LolaLouie]

In my 50 gallon I have:

2 Angels
2 Kribs
1 Dwarf Gourami
3 Cockatoo Cichlids
2 Bolivian Rams
6 Cherry Barbs
6 Neons
4 Pentazona barbs
6 Shrimp
6 Corys

Then I just bought a 30 litre for my 2 ADFs

My 200l is fine at the moment but I think when my fish get older (and bigger) it will be overstocked. So just wondering....

1. Do you guys think it sounds very overstocked (not waste wise as I have an oversized external filter but space wise)??
2. What of the above should I put in with my ADFs?

Thanks!