When it comes to overall versatility in the most scenarios I'll cast my vote for the Elinchrom 53" Octa, and as much as I love the Deep Octa I don't see it as versatile.
I have to say that I use the 53" Octa all the time in fairly breezy conditions and as long as the light stand is of good quality and it's properly balanced, then it works just fine.
From my own experience, going down to a 36" or 39" octa doesn't help the situation much if the wind is going to be a real problem. At that point it doesn't matter whether it's a 39", 53" or 69", which, by the way, I use just as much on location and in breezy conditions.
While an aluminum beauty dish does fare better in the wind, I think it would be a mistake to get a beauty dish unless it was a large one, but a large beauty dish means bulk and weight and doesn't prove to be convenient.