I wouldn't say the entire super needs a rework, but it does need consistency addressed. Here's my idea for a consistency buff over a full rework. For PvP, it needs to work a bit like eyes of tomorrow. As you wind up the animation, it marks targets. Then throws an even amount of needles at each target marked. For PvE, hitting a champion, miniboss, or boss with your charged melee while Needlestorm is equipped marks them. Using your super while a target is manually marked sends all needles at the target. If no target is marked, minors and majors will be automatically marked during wind up, and needles will be thrown at marked targets in an even amount.