For making this really dynamic, and being able to manage more skippable-steps, we should take into consideration the total amount of steps that we could have, and the position of each one, and treat all the steps next to the skippable ones depending on the state (skipped or not) of those who were positioned before them.
That would be a pain in the ass at this moment, and such a big change for a (currently) tiny problem.
My opinion is to land this the way it is, and if more steps to skip are introduced on FTU, we can have in mind a refactor.