Echo/Revenge

Alright guys, really need some help with this one. I love the echo/revenge type theme I have going here and know there is alot of room for improvement, thats why im here. So I think there is enough removal but may need more draw cards to reach for the power plays. I am very much considering dropping Justice as i removed the Harsh Rules which leaves only the Stonepowder. I know it definately fits my theme and i hate to see it go but with the 4th faction it stalls progresa too much to keep. I also think i need some lower cost buffer units to stall untill i can pull my Piercing Grief and/Clockroaches. Please let me know what you guys think so i can continue my climb and meet the rest of you at the top, thanks and have fun!