Keep those eviolite in, they are invaluable in keeping your terraks out there, even with tool scrapper being played.
Cilan can be very helpful but it means you lose some consistency as you will be missing some draw supporters that will probably net you enough energy anyway, maybe you could drop...