That tank looks pretty cool! TBH, i don't really know if betta's are a good match with angelfish, aren't they fin nippers?
I got my betta in a 20 gal, with 6 cardinals and 6 rummy-nose tetra's. They are doing pretty good together!
20 Gallon Betta and Tetra Fish Tank - YouTube