Usopp makes even less sense at this point. Used to back in the day but after seeing Wano Usopp I’d be surprised if bro ever gets a 1v1 fight again.
If we go with setups, Usopp my get a watered down new version of CoC.
He was sweating when Rayleigh showed it unlike the M3, but was still emphasized in the scene.
He 'accidentally' attacked a CD, unlike the M3 doing it on purpose.
But he wasn't in the Loguetown 'divine intervention,' scene. So maybe not.