Yes Heather totally needs to learn ninja skills from Ziva. This is a thing that should happen.

Idk, if she mentioned wanting to learn self-defense, Ziva'd offer to teach but idk if Ziva'd offer first. XD she doesn't exactly know what went down for Heather and all.