Proper fingering for this solo?

[Rot]

Specifically the scale run after the arpeggio.
I found two tabs that show the same stuff in different positions:

Notice the note circled in red.

Neither seems to be correct spot to play the solo.
Looking at live performance it seems to be sort of in between the two:

(1:14)

Animals As Leaders - An Infinite Regression (Thallium Festival 2013...

(1:30)

Animals As Leaders- An Infinite Regression live in Atlanta 2016

(2:43)

Tosin Abasi performing "An Infinite Regression" at clinic in Feedback Rotterdam...

What makes me question both tabs in the first place is the marked note - it would suggest either rolling the pinky one string lower and starting the run with an upstroke, or just the upstroke - both are super weird to play anyways due to shapes and the start on upstroke.

This is all more for academic purposes - I’m in no way able to play that sort of thing at those speeds, but the solo is cool to listen to and I guess it would be even more cool to practice, especially since I got bored with thumping.

I can’t make sense of the videos right now, quality isn’t super high and it’s too fast for me too catch.

EDIT:

Ok, I think I may be dumb, I just found Abasi’s own tutorial video showing how to play this, only it’s not called “how to play this solo”, but something about “double picking”:

Prog-Gnosis with Tosin Abasi: Double Picking

[Rot]

OK, if anyone’s interested - I watched the video in slow-mo more times than I can count trying to figure out what’s his fingering. I was constantly missing four 16s when he’s coming back up with the scale run, until I noticed he played it right the first time but too sloppy to be useful, and then showing it slower he conveniently skipped some beats. So I just took a wild guess looking at tabs and his general hand position and this is what I came up with:

It’s even weirder than the ones I poster earlier, I don’t know yet if it’s playable - at the speeds I’m sitting at trying to memorize it I could play near everything, so there’s no telling yet.
Notice the legato between tab 6 and 7 - this is seems to be his solution to my earlier confusion about rolling finger/starting on an upstroke.
Either way I seriously don’t think I’ll be able to play it at original speed anytime soon, but the solo makes for interesting practice. Not to mention it sounds cool.

[JBakerman]

There are a couple larger leaps in the first and third measure vs. what he’s playing on all those videos. I marked an apparent airball as a ghost note in the first measure here, but the following note is clear. The repeated 3-note downstroke sweep might be where a new take is spliced in the last measure. You could just hammer the second C# there to have more time to get to the E# with a downstroke.

Also he avoids a barre/roll in the last measure; fingering for first 3 notes is 1-3-2.