Personally I think just adding back the leech buff to Storm's Path would go a long way. Ensure it's long enough that we can do a couple of rotations without going back to Storm's Path and when you couple that with Bloodbath you'll have some very good boosted self-healing for when things get a bit rougher.