Contagion back to a circle

The new contagion looks sick as hell, I really appreciate the life force draining from my foes, what I don't appreciate is the auto target, single target spell it's become. If I'm swarmed by breach mobs, I have to desperatly pray that my combo of contagion then ED, hit the same target, and with like 20 mobs or any faster moving mobs that overtake the mobs that you've hit with contagion this can usually end up just spamming the combo and praying, which doesn't feel like methodical or tactical gameplay at all