No offense, but the combat-related changes suggested here are pretty bad ideas. Shamans are already great tanks to begin with, and giving them three hits with a spear would be very overpowered. I suppose you didn't suggest giving them enhanced damage, which means you've still got some functioning brain cells.

As for damage spells, you've obviously not heard of call lightning. It is a scary, scary spell. Imagine, for example, this new shaman in a certain crusader cabal. Three hits with that stuff, spirit aura, spirit horde, heal, and call lightning? That would be ludicrous.
Adding these combat changes and taking away staves would force shamans into a combat role. As it stands, they can feasibly go front-row or support. You take away staves, and support shamans get call lightning and heal. They have to go front row; there really isn't much more of an option.
However, I am very much in favor of an experience-loss-free variant of raise dead. If you still need the corpse, then priests still have an obvious advantage, but barbarians have a viable alternative to resurrection.