No, I haven't factored out TSBs. They don't add much against a Rikodou level opponent.
I think you're looking at a different implication of versatility. By versatility, I mean... Just look at Adult RSM+BM Naruto and Adult Sasuke. They're both equal in physical parameters like strength and speed. And Sasuke can counter all of Naruto's jutsus with his own jutsus (parallels exist on both sides). But in addition to that, Sasuke also has Rinnegan techs like Six Paths techniques and Ameno which add versatility, not power. Sasuke is exactly equal to Naruto with his Rinnegan techs, and is also equal to Naruto with his Rinnegan techs. That is versatility, doing things one way or the other.
Rinnegan doesn't even have sensing abilities, so forget that.
Naruto wasn't versatile against Kaguya.
Truth seeking orbs do plenty man. That move alone has the most versatillity in the whole manga. It can produce numerous effects that we havent even seen yet and no one is sure if Sasuke can really break it or not/ Nor if Naruto masterfully uses that jutsu. Same with Sasuke, noone is sure if he can use all the paths masterfully like Nagato yet they all portray him as if he does.
And never have I ever implied Sasuke could not counter Naruto. In fact I stated to many frickin times on this thread that they counter each other perfectly to a stalemate.
Rinnegan is an upgrade of sharingan. Narutos sensing surpasses the sharingans premenition. Without this Naruto wouldnt be able to fight against it at all. Sasuke would see it coming. So YES this plays a HUGE part. Kishi knew what he was doing adding sending to Naruto.
And Naruto was the MOST versatile against Kaguya. Sasuke used the same techniques that wouldnt work over and over. Naruto on the other hand got the best of her using alot of skills including 9 Bijuu signature moves. His fighting style in General is versatile. Its the only way he beats opponents stronger than him. By OUTWITTING them with powerful moves.
Oh and by the way yes they are equal in footspeed. Ameno is literally needed for Sasuke. Without it he couldnt keep up with Narutos shunshin or flight speed. However, if you really watched the movie you'd know Sasuke is physically the weakest out of them all. Naruto is a Sage and you deny manga facts by stating he is weaker. Sasuke had to literally keep moving as to not get totally crushed by Kinshinkis power. And Naruto punched Momoshiki(fused) through a mountain. Sasuke didnt have any strength feats putting him over Naruto or anyone else of their caliber in that movie. Sasuke has formidable strength.