(over)stocking question for 40 gallon

Hi everybody-
so here's where I'm at:
40 gallon, planted
6 rosy barbs
4 Endler's
(soon to be) 6 Dwarf Rainbow fish

Am I delusional in thinking that I'm understocked at this point? I tend to like the idea of understocking, but I can't stop thinking about putting a couple (3 tops, ideally a bonded pair) of Angel fish in my tank. What do you all say? Thanks bunches!

Rosy barbs have been doing seriously great with the Endlers. I'd probably believe it about the angelfish tho, except I see people having neon tetras in with their angels. My tank is proving a little bit too new for Endlers at this point anyway, I'm not sure how much longer we'll make it with them. Had a major upset with plants dying this last week. Anyway, my question is more relating to stocking capacity than fish compatibility, but thank you for your input.

Tank "was" cycled. Last week, it became uncycled-- needed to disinfect bathroom, using Lysol. Despite keeping the door closed, it apparently effected my tanks' cycles. This coincided with a plant death (I'm a total plant newb and didn't have the good sense to remove it in time) and the cycle crash was accompanied by a major bacteria bloom. The ammonia levels were just astounding.

Everyone survived in the big tank, lost 2 Endlers out of the 8 gal. In the 40 g though, my female Endlers are really listless, and one of the rainbowfish has a bloated abdomen. No scales popping, thank god, but I don't know if he's going to bounce back. At this point, ammonia readings are still turning out high and there is no end in sight to the water changes. Can't stand seeing them suffer, but Lord, I need a Python.

I guess I'm just trying to be optimistic with the stocking question, 'cause there's no way I'm adding new fishes anytime soon.

At this point I'd be looking to add some "free wheelers" instead of additional schooling fishes. Additionally, the activity level tends to drive me nuts a little, all this frenetic and random swimming about! That's why I had my hopes on angel fishes... but we'll just have to wait and see what happens with the current tank mess. I keep lucking out with barbs though-- the tiger barbs I had years ago wouldn't hurt a fly! err, wait-- I guess they did devour some snails I tried to keep, but I digress...