Good ideas, the lone SD should get a school of his own. The angel might not be tough enough to hang with the big boys like sevs. The rainbow cichlid seems like it should do fine in that set up and they do turn out to be good looking when they are bigger.
What about the common pleco? Might be better to replace him with a bristle nose instead.