I don't know if this has been suggested or not, but perhaps could we have a meditation that'd help us regain spirit post-death or after some spirit-draining critter's been at us? Maybe tie it into the same mechanic where we regain IF through killing?
If such is already in the works, or already in the game, then disregard.