You could do the angels, I would recommend getting three small ones and letting them pair off and rehoming the odd one. Six of the tetras would be fine and you could still do a bristenose, clown or rubberlip pleco as they all stay small enough for your tank and you wouldn't be overstocked. You could do snails if you want as well or instead of the pleco, nerite snails are pretty cool.
Is this tank cycled?