Don't bother waiting or using the samsung software either on windows or mac, it's useless.
I recommend flashing (with odin) and rooting, so that you can use the android sdk on your mac. It's a bit of a hassle, but I haven't looked back since doing it.
Basically set up a small bootcamp partition on your mac, install windows XP, flash with odin then you don't need to use windows again (unless you plan to re-flash the phone). I tried using Virtual Machines, but they are ridiculously slow and I didn't trust them when doing something as potentially risky as flashing a handset.
You don't even need to buy a copy of XP as you are allowed to use it for FREE for 30 days without having to activate it. Once you've finished with the bootcamp partition, just remove it. If you do feel the need to re-flash the handset just create a new bootcamp partition and install XP again. But I doubt you would have to, as once the handset has been rooted you can install updates from the SD card.