Advice:
use shaeled storm, its not as big of a deal when you are pure ww
but if you are going to be standing still at any one time you will want a shaeled ss to reduce block lock,
but it would be a good idae to put that 40/15 stormshield on switch
defintely switch to cats eye amulet, because javalins gain damage from dex, therefore it will benefit you more in every way
i suggest getting a berd 09 gaze or 40/15 08 gaze
for maxed dr, every little bit helps huge

hope this helps =-)