I think the change should stick, but I've modified it so that there is a chance a Controlled Trans or Wraithform mage can't shift into insubstantial form fast enough. The mage will have to make a dex check against a d50. So the shield bash will still happen more often than not, but the defense can be utilized sometimes as well.