Even after you update your list, I think you should take out 3-1 cloyster....I dont think i have ever seen a cloyster that was competitive enough to earn a spot in a deck.
Also, you could tell us if you're a junior, senior, or master. Then we can help you as far as complexity of play.