With my group of players we noticed that moving the "Remove Token Step" of the END PHASE at the begin of a unit's "Activate Unit Step" of the ACTIVATION PHASE, the game is much more funny to play.
In such a manner even the units activated at the end of the turn can take advantage of the Standby Option and the other options like Aim and Dodge.
That's all, thanks for your attention.