hi and welcome to fishlore
i'm with krismoore888, i'd definitely return the CAEs, they can be extremely aggressive and have been known to latch on to the sides of other fish
if you have a common pleco i'd definitely return him as well, with just that pleco in the tank you are already fully stocked!
angelfish would be a great addition, i would either go with just one angel OR if you want two then you have a couple of options because just putting two angels into a tank doesn't mean that they will become a pair. you can either buy a proven breeding pair (which can get very expensive) or you can buy six juveniles of approximately the same size/shape/type etc and wait for a pair to emerge naturally, and then return/sell the others.
with the angelfish, if you want smaller schooling fish such as tetras or rasboras then you're going to want to add the smaller schooling fish first, and also make sure that you get juvenile angels. that way they will be less likely to look at your smaller fish as a snack!
for the bottom, i'd either go with six otos, six corycats, or a bristlenose pleco instead of a common pleco (the BNs only get up to around six inches)
something else you might want to look into instead of a "small" schooling fish would be dwarf neon rainbow fish, they are larger than a
neon tetra for example and the angelfish will have a much harder time fitting one of these guys into their mouths!
http://www.peteducation.com/article....+1951&aid=2525