Chris you might want to observe your angels(just to be sure) but I would go with the
red tail shark also. My clown loaches "whisker" everybody just to move them out of the way but never had them nip anybody. My koi angels have been in the tank with the neons for four years and they haven't bothered the neons at all. They seem to be more laid back than any angel I have ever owned.
Since their fins are damaged you want to make sure your water is as close to perfect as you can get it to prevent and disease. Maybe an extra
water change a week until they are better. I'm a great beliver in clean water to prevent disease.
Carol