I'd consider swapping a royal gramma for the dottyback. They're pretty hardy, less aggressive, have about the same body shape, occupy the same kind of niche, and are likely less expensive.
As far as the angel goes, LA does seem to recommend at least a 30 for even a flameback, so I'd assume it would be the same for an Atlantic Pygmy as well.
What about maybe a firefish, court jester goby, or hi-fin banded goby? All those guys will be okay in your tank and are colorful as well.