I had to appear since it said "Come All Wisemen..". LOL
Now that I'm here, your plans sound pretty good except for the "some angels". Angelfish get pretty big and should be kept either singly or in groups of 3-4. I don't think the tank is big enough for a group... at least not long term but you could start off with a group and see if any pair up and then just keep the pair. Plan on rehoming all except one or a pair to keep things peaceful.
This site has good info on them and also has a SC - Species Compatibility paragraph for other ideas for suitable tankmates.
http/fish.mongabay.com/angelfish.htm (scroll 1/2 way down for the regular angelfish info)