Your second idea is quite good although maybe better without the parrot fish, the rams would be ok with the parrot fish, not sure about the angelfish though as i know parrot fish can be bullied by other cichlids.
Why not change the parrot fish to a keyhole, they would be better to have in my opinion.