I'd move the altifrons unless you are definitely getting atleast a 180, they get big and like groups. Dats are great looking fish and if I remember correctly they are fairly slow growers so you'll have a little time. I would be hesitant to add angels with brasiliensis, while the are not aggressive compared to a midas they can still be surly coupled with their size an angel wouldn't have a chance. If I were in your shoes I'd get schooling fish and wait for the upgrade until getting more cichlids, but then again an overstocked tank makes it easier to justify the cost of upgrading.