Yeap. That's what i would do. You never know what can happen when a fish undergoes stress. And what kind of diseases it can get from being so stressed.(usually ich) You should always take into consideration not how big the fish is at the moment, but rather how big the fish will be.. fully grown.
I definately recommend a Pygmy/Dwarf Angel. Some nice ones: Flame Angel, Coral Beauty, Ebili Angel, Bicolour Angel. May be get a Dwarf Lionfish. Some nice little gobies (not with the Lion) and maybe a pistol shrimp/goby combo.
Yeah Mitchell those are nice additions to any tank. Gobies are awesome. But if your going to be doing a semi-aggressive or an aggressive tank i would not suggest getting gobies OR the shrimps because im sure once the aggressive fish got larger, the small gobies and shrimp would be on their dinner menu. Just make sure that before you get any fish, you research them very carefully.