Unit Order Movement problems

[bananaHUNT]

In the map, my unit can only move using an ability (Move Unit) to target a highlighted square (unit). I have the following trigger to disable movement:

Stop Movement
    Events
        Unit - A unit Is issued an order targeting an object
        Unit - A unit Is issued an order targeting a point
        Unit - A unit Is issued an order with no target
    Conditions
        Or - Any (Conditions) are true
            Conditions
                (Issued order) Equal to (Order(smart))
                (Issued order) Equal to (Order(move))
                (Issued order) Equal to (Order(attack))
                (Issued order) Equal to (Order(attackground))
                (Issued order) Equal to (Order(patrol))
    Actions
        Unit - Pause (Ordered unit)
        Unit - Order (Ordered unit) to Stop
        Unit - Unpause (Ordered unit)

And another one to move the unit when he uses the "Move Unit" ability:

Move Unit
    Events
        Unit - A unit Starts the effect of an ability
    Conditions
        (Ability being cast) Equal to Move Unit 
    Actions
        Trigger - Turn off Stop Movement <gen>
        Unit - Order (Casting unit) to Move To (Position of (Target unit of ability being cast))
        Trigger - Turn on Stop Movement <gen>

Now as you can see, when the player doesn't do anything when the unit is moving, it works ok. But when he issues another order while the unit is moving, it gets stopped by the first trigger. Any ideas on how to work around this?
The main plan is to let the unit only be moved using the ability.

 

[Accname]

maybe you could safe up the target point of ability being cast as varable and change the first trigger not to order your unit to stop but ordering your unit to move to the saved variable point.

 

[bananaHUNT]

Nah that didn't work either, but I've solved the problem by making the unit unclickable during the Move Unit ability!