I agree the third Smash can go - I like a Null Rod here to still deal with equipment, but also add game vs Storm. I think you really want another Rough//Tumble for the Elves matchup - I expect a lot...