Alright, since I involved myself far more than I wanted, there you go…
- I did not touch the Somaliland borders so they currently overlap with Khatumo
- I drew the western border as an almost-straight line as in the map.
- As the result, several districts are now cut in half by the new boundary, notably Erigavo District and its capital.
- Overall, that means that the situation in OSM matches the situation on the ground, i.e. a complete mess.
I’ll use this opportunity to disclaim any further responsibility. 