Leave the current kit un-touched, but add another mechanic (essentially, make Q a double-cast ability) to Shen where he places down the spirit blade for a certain period of time after pressing Q, and it could be re-activated again to retrieve it and do the exact same effects as his current Q for the second cast. The spirit blade's existence would be on a different timer system than the CD of Shen's Q and it would be displayed visibly on top of the blade once it's summoned, during its existence, the blade could be retrieved indefinitely and combo with W as intended like current Shen until it expires when the timer runs out, which in that case it would need to be re-summoned again. The spirit blade itself has no cooldown timer after its timer runs out hence could be re-summoned as soon as it expires. When Shen is too far away from the spirit blade, it automatically depletes the timer and vanish, making Shen able to summon it again. Ultimate would bring along the spirit blade next to Shen's teleported location without it vanishing and the timer intact.