2 Possible Tank Set Ups

[skyllines]

I have a 55 gallon long tank, currently only inhibited by 2 angels and 2 Bolivian rams. The angels are a mated pair; I'm pretty sure I have 2 male rams. So any way there are two possible setups I have been considering and I would appreciate any thoughts, tweaking, or suggestions as to which one would work better or a mix of the two.
Tank 1:
2- Angelfish
4-Bolivian Rams
1-Bristle Nose Pleco
10-Black Tetra
(I know this tank is almost to maximum capacity)
Tank 2:
2-angelfish
2-Bolivian Rams
2-Keyhole Cichlids
10-Black Tetra

thank you