Thanks! Friendly tip for delayed visa; they have an expat hotline where you can call and get things fixed immediately. Worked for me once even if I'm not an expat.

So since the layover package includes transit visa, I don't think they should waste money buying eVisas (both ways). For everyone else, I would always recommend having visa before travel - anywhere.

Maybe this isn't the right place to discuss it, but I will book a guide and car from a close family friend. For day 1, I thought just breakfast at Kategna Bole, then head for Merkato, lunch, old palace (special tour in unity), a drink stop at Hilton and then maybe Yod Abyssinia in the afternoon. They have 16 hrs from landing to takeoff, but I guess this translates to maybe 12 hours with entry, security etc. Not sure they will have time for more than two tings and meals+drinks. I gave them some eskesta videos, so Yod Abyssinia in the afternoon is unavoidable at this stage. For day 2 (return) - keeping it open for now.