Infestor's neural parasite doesn't seem to fit

The Infestor is new Zerg caster unit in Starcraft 2, replacing in part the Defiler from the original game. I've only seen them in action in the recent Battle Report 3, but it must be said that the fact this fat, spiny creature can use its Neural Parasite ability to instantly mind control any unit (biological or mechanical) WHILE BEING UNDERGROUND (!) is a little overpowered, and unconventional.

This ability came two abilities of the previous game, and both abilities were pretty fitting. The queen spat a parasite onto another unit. The dark archon was a kind of supreme being shrouded in red smoke while hovering; OK, he seems capable of mind control. The Infestor doesn't. Blizzard have nerfed the ability in making it temporary, it is still very much OP.

Basically, I reckon the infestor should have to unburrow, spit the parasite, wait x (10) seconds for the infestation to occur, then mind control for y (also 10) seconds. It should be up to the targeted player to notice if the unit has been infested, giving them a chance to act. This should result in less spam of the ability, gets the infestor away from the front lines, and adds an more of an element of sneaky to the game, rather than just darn unfair.