I like the idea of Armada getting distance-based XP based on kills other Armadas do. Potential for much sweetness, definitely.
Qadi I haven't played with myself, but purely from flavor perspective anything religion-related feels odd to the Songhai we have in-game. Given Songhai playstyle in general, something that helps with the "downsides" of getting a new city seems better - reducing religious unrest by a ton is certainly a good starting point, after which I'd probably give the building some combination of culture/production/gold, some as just base yields maybe.
My point here is that a Courthouse replacement is something Songhai will be wanting to build in newly taken cities
anyway - it doesn't have to be super-amazing really. Some extra yields on a cheaper building that's the first you buid in a new city - that is already quite a bit of help.Culture costs get up as you conquest, production helps the city get more usable after you ransacked a third of the buildings, and gold of course can invest in the war machine/rebuild.
Just tossing ideas about:
UB - Qadi (replaces Courthouse):
Available at Philosophy
200
Production Cost
Production cost scales with number of occupied cities
can be built in non-occupied Cities
eliminates unhappiness from occupied cities
+3

Production
10%

Production output converted to

Culture and

Gold
Reduces

Religious Unrest by 80%
In my opinion, one of those things that don't need to be super-fancy - rest of Songhai's kit is already very visible, as it were. While the gold and culture seem small, odds are that by late medieval, the first five buildings you (re)build in a captured city are going to be production buildings.
Or put in other words, with this, Songhai gets captured cities up to snuff faster than any other civ.
EDIT: Also, gonna start that Morocco test now. Sorry for the sidetrack
