Savagery Warder, WPS & RR help please.

[Grim Reaper]

Hello.

Would love some help with my Lightning Savagery Warder, playing on ultimate gathering gear atm.
Playing this build (don't have all gear yet): https://www.grimtools.com/calc/O2G13a6Z
Made the build by looking at some Lightning warder builds.
Read about WPS and RR stuff and it left me with some doubts about some skill/devotion points in my build.

1a: Is Upheaval worth taking? 1b: If yes should i put more points in it?
2: Should i put more points into the WPS? (Feral Hunger, Zolhan's Technique and Markovian's Advantage)
3: Would more points in Fighting Spirit be better than more points in WPS?
4: Would the WPS be better to max than Wind Devils (Raging Tempest)?
5a: I could remove points from Heart of the Wild, Decorated Soldier and Fighting Spirit. 5b: Or is there something else it would be better to take points from?
6: Should i remove Viper or still worth it for the OA% and when Ultos isn't up? (since i got Hand of Ultos)
7: Could also go for a 2 Mythical Signet of Astral Ruminations instead of Coven Storm Seal.

some of the things are hard for me to find out what is best so hope some one can help.

I know some of my resistance could be over capped more but want to find the items first to see what rolls i get before i work on that.

Any input or help would be great.

Edit: https://www.grimtools.com/calc/pZrmmj3V

[Matthew]

1. If you have crit, sure. Markovian's is more important.
2. Markovian's, yes. It is indirect OA and you need to crit with this build. Pull points from Heart (don't need overmax, it is only adding 1% per point) and you can pull 1 point from Scars and still maintain 100% armor.
3. I'm not a fan, and you don't have many points left to work with.
4. Without doing the math but just from intuition, it probably equals out, more or less. 4% RR isn't huge, but it is a modifier after all others, so still results in a decent increase. You could pull the 4 points, but you likely won't notice it in play at all.
5. Yes, as per above. Put them into Markovian's.
6. Eh, may as well keep it. You need the points for spear and 3% OA is probably better than what you are going to get trying to move points around. Again, you need to crit with this build.
7. Nah, you need the poison resist. The rest of the stats are practically the same.

[Grim Reaper]

Thanks.

Guess i will take 7 points from Heart of the Wild, 1 point from Decorated Soldier, 2 points from Fighting Spirit and 1 point from Scars of Battle. Putting them into the WPS.

With having 75% WPS chance is Upheaval still worth the 1 point?

[Grim Reaper]

Forgot to ask what rune is best?

Rune of Rahn's Might, Rune of the Stormtitan, Rune of Ultos' Arrival, Glyph of the Stormclap or Glyph of Arcane Insights?

Using Glyph of Arcane Insights atm.