Ditch the calm mind/nitro charge for substitute. Run life orb or petaya berry(if running sub over calm mind) or salac berry (the reverse). If running that set on a sun team, ditch shadow ball instead of fire blast for hp fighting. If not running it on a sun team, THEN DON'T RUN IT what do you want to get walled by? I ask this because when running either one, there will be something coming in to ruin your day.
HP fighting alongside shadow ball allows for perfect neutral coverage, yeah. But aside from tyranitar and heatran, hp fighting seems pretty useless. You need five calm minds with a life orb just to have a chance to ohko blissey, so that extra turn with the lum berry is doing nothing for you unless you end up seeing a Whimsicott, Tornelos, or Voltolos. HP fighting unboosted won't ohko terakion, so I'm not sure how reliable it'll end up being. According to the Urgamoth thread, Heatran is running stone edge these days a lot (I personally don't believe this, but whatever).