Definitely liking this build better. Still have the occasional issue with being one-shotted but that is gonna have with any Witch Doctor build. Also was able to roll my gear pretty decently as well so I'm at the point to where I'm mainly just gonna try for Ancient versions of my current gear as well as relying on Paragon level boosts.
Also farmed some lower greater rifts today to get my gems a higher level. Got one to 45, one to 30, and the other to 28.