Best idea for my 37g..

What would be the best idea for my 37g? Should I rehome the angels and SAE and go with a different show fish like Rams instead? I am keeping the Harlequins as I like those and the platies/swordtail I have in there aswell. But what should I do? I miss having Rams as they stay small and are nice in color.

Heres what in there now:
2 angels
1 SAE
12 Harlequin Rasboras
3 SA Bumblebee catfish
3 platies
1 swordtail(hasn't grown since I had her)
1 lonly corydora( he needs friends.)

Give me ideas what I'm best off with. I normally keep the tank tamp at 78-82.

I changed things around and took some fish to work. I also took the Betta out and put my Pearls into it from the 20.

Here's what in there now:
Pair of Pearl Gouramis
12-13 Harlequin Rasboras
3 SA Bumblebee Cats
1 Albino Corydora, will be adding 4-5 more soon.

I'm going to add about 5 more albino cories to make it a group of 6 cories for the 37, But could I do more?

Even with the bumbleebee cats?

If I had 10 cories plus the 3 SA Bumblebees, I think that would be a bit much, wouldn't you guys think?