I have a 30 gallon tank that is home to about 10-15 plattys, 10 guppies, an angelfish, a pleco, and a male and female betta. Now before I get yelled at for all these fish living together, they get along great, and there's never been nipped fins or fights. But I know my tank is way over stocked, and I still have 30 guppy fry in a tank getting ready to be released with the adults. What size of tank would you recommend? Chances are the angel fish will be getting her own tank within a month or so...