Seems solid, I would certainly go with the changes suggested. You shouldn't rely on your opponent to draw the cards for you (although that is some interesting meta thinking there), the moment they...