Yeah. If I were you, I would probably compact the offense to make it focus more on the combos you want to implement, and then add some real heavy-duty defense than can last a good number of turns. Something that might be fun to try if you are afraid of your opponent having the same defensive brigade as you is a Gates of Jerusalem defense, whose EC's will not be protected from your own AoCP when you play it. A Burial Shroud would definitely not hurt this deck either.