A relative newcomer, Mon Pays has tours all across Ethiopia, and can customise your itinerary. They're especially experienced in dealing with French travellers.