The angel looks like a Swallowtail angel (Genicanthus melanospilus). It is NOT a dwarf spiecies it gets to 7", and the recomended tank for a Swallowtail angel is 100gal so he mite be ok, and agreed the sailfin will get way to big for the tank min 125gal as they get 1'4", so over all looks to me like your going to have to upsize the tank within a year or so.