I think boosting your land base to 23-24, taking out one of the sunhomes and maybe adding in some cluestones/keyrunes would go a ways to fixing your mana woes. You don't really have any card draw so getting some alternative mana acceleration in there is important.

I'd run more boros charms, they're the best charm in the set and they're a good way of keeping your angels alive. Smite, Martial Glory and moment of heroism may work better with a larger creature base at a lower mana. If you want to be sort of controlly and sit back I'd maybe put in a full complement of Oblivion rings and some Bonds of faith/Faiths fetters.

Anyways that's my two cents!