Only a thought. I know it's a total non-starter, God only know's why I'm writing this, but....
How about this for a solution.
Re-write the borders of African countries on a Tribal basis rather than an enforced colonial/geographical base.
Let the tribes sort it out.