Haha! Well if he does it you are more than welcome to do it!

I never knew angels could be that beautiful. Discus are my favorite of the SA cichlids, but those things are making me rethink that. I'm astounded. And I also see why you want to break the biotope.
I'd ask about the buffalo head and congo tetra. Getting rid of the ctenopoma sounds like a good idea if you go with the angels. The only things I've heard about them is that they are aggressive.