Revert him back to his pre timeskip self, specifically East Blue. He shows hints of that character sometimes, but he's a shell of himself overall. Most of the Strawhats are tbh, they've been watered down to be defined by their quirks (stupidity, perversion, being cute etc). "Perks" of an overcrowded cast.