Geko Moria is sad onion that stands not a chance without his devil fruit in current One Piece...

Usopp for right now he defo will be stronger in elbaf tho if it becomes an arc hopefully