I too was there (84-86 in the State Statistical Office in Addis doing the agriculture pre-harvest forecast and post-harvest estimates) and loved the place. (I also played more and more varied music than at any other time I think!).

I'll follow your trip with interest. Hope you have a great time.

Mick