Thanks for the suggestions. I am not sure if I want to remove the thunder dragons. They have been great for lightning vortex/quickdraw/brionac. I know they can be a dead draw but I have yet to have that problem.
I did replace 1 junk warrior for 1 drill warrior. With level eater, it's very easy to bring junk warrior up to 2900+.