We're also talking about immigration officers that barely speak English, are doing it for their military service and don't really care.

I don't think they're going to be that picky over the definition of a direct flight. As long as you came directly from Australia, didn't enter another country for any period of time, I'm sure you'll be fine.