what i generally recommand in a case like your’s is to go direct to step (8) or (9), but WITHOUT WIPING OR FORMATING ANYTHING, to keep /data untouched…
only wipe or format if you are forced…
Update the recovery-e like explained in the step (7) like you did become mandatory when error occur in step (8) or (9), but i recommand Wipe or Format only when a (7)+(8) or (7)+(9) sequence leads to an error