Like you said, do research.

Anyway I think OP has a point there. They need to either make another version of gaara and call it Gaara [Great Ninja War] and use that in game model while reskin the current Gaara 5th Kazekage because currently he is using the GNW model amd I believe his mystery was developed after he got killed and revived because he didn't use that skill when he fight Deidara. Clip : https://www.youtube.com/watch?v=yNYK58pQi7Q
Or to make thing easier like op said, just remove the the jinchuriki tag and it's done. Also change the cover image for him in Ninja tab.