Azir and "Basic Attacks With Summons" Suggestion

I thoroughly enjoy Azir but there is one complication I am having which I find to be rather troublesome and was hoping that perhaps there could be some kind of remedy. When you summon one of his minions and click on someone to attack, everything is fine until your target runs out of the range of his summons. At that moment, Azir begins scurrying across the map to chase down his target. Azir is all about positioning and valuable time is wasted when you have to repeatedly tell Azir to stop running off, put him back in the rear, and then resume targeting a new enemy. If perhaps you could make it to where, when a target is selected to attack while within the range of the summons, if they escape then Azir will simply dis-engage the target.