If you check out my original post, I listed a few things to the druid. The one in particular you are referencing is that if he Wild Shapes without announcing it to the party. Every time, he's simply stated, "hey guys, I'm going to change into XXX" then he shapes. Possible disadvantage avoided.