A suggestion for Shen's new Q

Let me start off by saying that I'm not a Shen main, nor am I in the PBE, so maybe this is too much or I'm missing something.

Overall, I think the rework looks really nice, but I have a gripe with the way his sword functions. It bothers me that it sits there on the map indefinitely, doing nothing (more or less) until you need a shield/damage, and I think changing the way his Q works could improve it from mechanical and aesthetic standpoints.

Basically, my suggestion is to change his Q to a two part ability where you hit Q once to summon the sword inside of a small/medium sized radius around Shen, then hit Q again to recall it. What this would do is give him more control over his positioning for Q recalls and his W, as well as keeping the sword from ending up idling on the side of the lane or something. Hell, you could even take it a step further and put a timer on it so that it auto recalls if it isn't used (deny the shield/damage so that there is a penalty for not using it in time).

But again, this may be too much flexibility for the buffs the sword gives you and your teammates...I just feel like it would work and look a lot better this way.