Sorry to burst your bubble, but i personally wouldn't put any of those fish in something smaller than a 10g. In fact, the upside down cats should go in tanks bigger than 20g, IMO. Far from being able to have more fish, i think you are overstocked.
P.T.