
That is a GREAT set up. The one thing that you need to check is you
pH and hardness. If you have soft water with a neutral mid-low PH then normal rams will work. But if you have something like a 7.8 or 7.6 Ph, I would go with Bolivians. They are a little more tolerant of higher Ph. All of the other fish should do fine with most PH levels if it
stable.
You might also want to consider one or two less corrys and one or two less X-rays, just to keep stocking low. If you get juvenile angles and juvenile rams, then they should just grow up together.
Pick some smaller corrys. Something like the Juili corrys are small or some other form of corrys.
Other wise I think that you have a great set up. Actually I was thinking of having something like yours after I try and renovate my 29 gallon this weekend. 2 angels 3 Bolivians and some schooling fish. I also will have 5 corrys.
Hope this Helps