Okay this looks easier than it is trust

I'm working on an enchantment that is supposed to make you move faster while using an item, like blocking with a shield or loading a crossbow. Pretty much impossible to do with the enchantment alone so I had to use an external system of an advancement and a score board, triggering the using item advancement sets a dummy score to 2, and revokes it. and a tick function is ready to always subtract that value by -1, the problem is. No matter how hard I try because of the way using_item works I am always one tick late to removing the speed attribute once the player is no longer using the item. Which gives them a dash like quick movement to the front, which I dont want to happen, is there a solution or am I hopeless