Liar there was no Gosha sultanate.Doesn't change anything. The Gosha beat the combined forces of the Ogaden in 1890 and kept them away from the Jubba. This only confirms the Oromo on the west bank after 1830. The Boni were the only competition for the Gosha within the gol.
Clan map circa 1977:
The Gosha is in pink. The Digil are in green. The Ogaden replace the Oromo on the west bank of the Jubba well after the initial settlement of the Gosha villages.
And your map is not up to date at all.