So, as some of you know, I have a desperately overstocked 16 gallon tank. I have 6 female bettas, 5 ember tetras, 12 Endler's Livebearers (unless some of the pregant females (

) have dropped fry that I haven't noticed), 1 albino cory, 1 bronze cory, 1 peppered cory and 1 panda cory. And some RCS. I am currently dealing with this (sucessfully, but it can't last forever) with an absolute buttload of live plants, some of which are fast growers to suck up waste more efficiently, two filters (a Fluval U1 and a Fluval U2) and 25% water changes every second day. The ammonia is staying at 0, so far so good.
If life still loves me, then we will be getting a pond this summer, and my sister's goldfish will be moved into it, freeing up the 90 litre/23 gallon AquaOne 620. With any luck, I will be inheriting it. Now, this is my quandry: which of the following options do I go with?
OPTION ONE:
90 LITRE: The female bettas, the 12 Endlers, 4 bronze/albino cories, 4 peppered and 4 panda.
60 LITRE: Odysseus (my male betta), 8 embers and 6 pygmy cories.
OPTION TWO:
90 LITRE: The female bettas, 6 ember tetras, 4 bronze/albino cories, 4 peppered and 4 panda, and 6 kuhli loaches (I have wanted these fish forever).
60 LITRE: Odysseus (my male betta), 12 Endlers and 6 pygmy cories.
OPTION THREE:
90 LITRE: Odysseus, the 12 Endlers, 6 ember tetras, 4 bronze/albino cories, 4 peppered cories, 4 panda cories, 10 kuhli loaches.
60 LITRE: The 6 sorority girls and 6 pygmy cories.
OPTION FOUR:
90 LITRE: All the fish currently in the 60 litre, plus boost the cory schools to 4 brzone/albino, 4 peppered and 4 panda and add one more tetra.
60 LITRE: Odysseus and 6 pygmy cories.
My favourite option is number 3 (and yes, it is slightly overstocked, but I will happily do the water changes, will have millions of live plants and boost the filtration, and move the tetras to the smaller tank if necessary), but there are a couple of problems. I've never tried Odysseus in a community tank, so I don't even know if this will work. There is also one overlying problem with all of the plans - the tank depth. The 60 litre is 18 inches tall and only 14.5 wide. My girls cope with the depth no problems at all, but Odysseus is a halfmoon, used to his long, shallow 5 gallon. I don't know how he'd cope in the 60 litre or the 24 inch deep 90 litre. Of course, I could have option 4 and just leave Odysseus in his 5 gallon, but that is less fun, because there is less water. :p
So, apologies for the length of the post. I would love opinions from people! :)