Do what the card says. Don't do what the card doesn't say.
The card does not say to make up rules which magically make a maneuver substep no longer a maneuver substep.
I agree with the first part. Do what the says. It says to move a step to happen after another step that comes after the maneuver is complete. It doesnt say to make the other step part of executing the maneuver.
That step being a necessary part of the maneuver that the maneuver cannot end without.