i dont know why you need to have puffers, because most if not all are quite agressive, and many of them need to be transitioned to brackish or full marine water by the time they are adults.
i adree with rbishop. you should probably get three angels, and then there are way more fish you could put with them.
you could have some larger tetras, like black skirts, lemons, black phantoms and red phantoms, bleeding heart, diamond, and if you can find them, congo.
the vast assortment of corydoras also go well with angels, as do rams and dwarf gouramis.
WARNING: if you decide to get a trio of angels, stay away from small fish such as zebra danios, neons, cardinals, rummynoses, guppies, etc. and notorious fin nippers such as tiger barbs and searpe tetras. also, i have found that the bigger gouramis such as the opalines and the like can clash with angels.
