I never had angels before but I hear that they do better in a deep tank. This may be something you want to consider when picking the size tank. Go with the 55 gallon if you are definitely getting the angels. I think cory catfish would work well with the fish that you mentioned because then you would have action on the bottom of your tank and also they help with fish that are shy such as angels. GOOD LUCK!!!!!