I think you would be better served to add some flags to perhaps note what state you are in, and then use millis() or micros() to determine when the move event is over. That way you are not sitting in delay() somewhere and the sketch can be doing something useful instead of just cooling its heels waiting for delay finish.