My suggestion for reincarnate is to have it do exactly what it says. Keep the no grave injury and low cost, BUT the reincarnated person is a new being, different race, adjusted max stats and keep classes. Might be a problem with unique characters. I've never used either of these spells though.