Loki as 10th member

I feel like the story is setup in such a way that we find out Loki isn't actually bad but reckless and misunderstood and nobody can control him. That's why Scooper is testing Luffy to see if he can handle something not even Shanks could. To me it seems like Loki will be the 10th member of the Straw Hats and he will specialize in a menagerie of some kind, probably the Sunny will see an upgrade here in Elbaf with all that rare wood lying around.