Alright, so unlike earlier, I genuinely believe that Ayanokouji will have a big advantage here (and that's because my scales for him have changed drastically), and the primary reason for that is the fact that he is basically L, but with better stats, and even emotional and social intelligence.
Let's recall the initial episodes, there, L was able to trick Light. The Lind L. Tailor scam to Light literally just revealed the fact that he was in Tokyo. Now, Ayanokouji, in the Cruise Ship exam was able to trick Ichinose, lying a two-layered trap with counter measures, which just proves the fact that Ayanokouji should easily be able to replicate the feat, as his tactical deception already surpasses L at least in this one. And we know how penetrable Light is to multi-layered traps, like Near also did a two-layered notebook trap and actually caught Light. Ayanokouji, unlike Light, has more counter measures advancements which helps him way more to deal with people like Light. More examples of multi-layered traps would be the trap to Takuya, where he basically trapped Takuya in his own emotions and caused him to break more rules, and he also set the other students to actually interrogate him, and he would have been cornered either way.
While Ayanokouji might not be able to match the likes of L's intuition, he's basically way different than L. In the 2nd Year arc, he basically did great profiling on Takuya (the second Yagami lol), without even meeting him for once. Bro had an idea of how Takuya would react to a situation with basically details from scratch, how he behaved in the different situations, and Ayanokouji even deduced that Takuya was the one behind the violent rule breaks of the school and used all of that by making the love letter anagram on top of everything, got Takuya cornered, and got him expelled pretty much.
Ayanokouji's strategies already surpass L, L's strategy of self-revelation was "high risk, high return" strategy, based on the principle of "keep your friends close, and your enemies closer", which again wouldn't match with Ayanokouji's style of warfare, who takes leads and tries things from behind the shadows. While yes, L did that to genuinely get police trust on the other hand as well, Ayanokouji wouldn't need such things since not only will police have different feelings about him from the start in here, but Ayanokouji also has his father's influence, who is a tyrant in the political world.
Another thing which Ayanokouji has is higher deception (better misdirection, fabrication, concealing, acting skills, information control, bluffing, controlling with fallacies) shown throughout the 1st Year arc in the strategy from Volume 4 to Volume 7 (basically known as the "X strategy"), he is also a better manipulator than L (I don't think this needs to be debated).
Now when Ayanokouji's advantages to L are proved, let's go towards Light. So, Light will of course try to kill Ayanokouji. Now, depending on scenarios, Ayanokouji will lay his profiling traps. Coming to how this would reveal his location, so Ayanokouji will play strategies like L and trap Light (feats: Housen trapping, Kei development), considering how his traps settings are better, I think he will easily overpower Light in this one. Ayanokouji not only lays traps, but also ends up emotionally manipulating and destroying his opponents, kind of what he did to Takuya, and let's not forget that Takuya was trained for a year specially to become a weapon against Ayanokouji, and he was trained to have a good point for every bad point of Ayanokouji, and Ayanokouji still turned his weakness to strength and showed Takuya the way out.
So, yes, I think Ayanokouji will have a huge hand on this one for snatching the victory, he will never reveal himself, and his profiling and psychological analysis would help him to investigate on Light.