Which fish combination would be better?

I hate to say it but neither sound good. Both tanks are just to many fish for one 20 gallon tank. Angelfish get big and need a good amount of space. Even worse on A you have Angelfish that can be aggressive(personal experience) and red tail sharks that can also be aggressive. The angelfish alone is going to need about 10 gallons. Keep in mind the very general rule that you need one gallon of water for each inch of fish. I have seen my fair share of tiger barbs that killed other fish with their constant nibbling. I would start him off with some Tetras they are easy and inexpensive. If he does well with those then consider the other types of fish. Good luck!!