The answer to "what if I want to avoid an engagement" isn't to move your tool 4 times with your own squadron in hand. It's to pre-measure distance 1 from the target. If you can't gauge a safe space from the only target that matters, then no amount of shuffling is going to help you;
You know what I'd do? Make the rule "After picking up a squadron to move it, the player must immediately place it in the desired position along the distance ruler. Once the squadron is on the table, it may not be moved again."