I would swap out witch's apprentice for another Zap! or Earthshock. Zap is good early removal and Earthshock is another way to deal with warlocks.
Also, consider if skulking geist is necessary. Innerfire priest might not be a thing and jade druid is out. Weapon removal might be a more important tech anyway or just improve your overall early game and deck synergy.