They could just make Thunderbird's persona based more on James instead of John. James is what John would have been had he been allowed to live, get character development and soften up. Especially if Wolverine is not in the first one as a team member and hero, John can serve that similar archetype of brash anti-hero whom conflicts with Cyclops. We at least wouldnt get the love triangle tease with him