ShalomToYou, I don’t know what you’re talking about. Ever seen the proofs as to whether “oh” or “oi” is correct? Spoiler alert: The proofs for “oh” are much more convincing.
Anyway, the rabonim (might’ve been the Moetzes, but I don’t remember) decided many years ago that both havaros are fine.
You’re right about the Adi problem. That’s definitely not how it’s pronounced.