First, off T'Challa. He's too tainted now. Or give him a magic reboot of some kind. Just make all this crap go away.
Second, introduce a new Black Panther. Either a new one entirely, or a revamped old one. No more Wakanda, no more kingly politics, bring him to America where he can interact with characters and settings people actually give a fuck about. What's Wakanda? Why should anyone care? It's fine as a place he's FROM, but not as a place he IS. It's just as lame as sticking a character in Hoboken or something. Nothing happens there! Let the new BP be a -representative- of Wakanda to the outside world. Put him on the Avengers or something where he's in the middle of stories that actually matter in the Marvel Universe.
Third, write him as Panthro. Because the awesomeness that is Panthro cannot be denied or contained. Let him spend his time building awesome shit and kicking ass, and occasionally kicking ass by throwing the awesome shit he's built at people who failed to know better than to piss him off.
That means emphasizing the PANTHER and letting the Black fade to the background. Yes, we know he's black. We shouldn't care. Does anyone care that Samuel L Jackson happens to be black? Sure, we know he is and all, but all anyone really thinks about SLJ is how badass he is. And that's how it should be. "Judge him not by the color of his skin, but by the content of his character".
Under the writers we had, that content was sorely lacking. It's time it changed.