I ended up going with Optus and the iPhone 3GS 16 GB. It's not where I thought I was going when I started this thread at all, but it's a good deal that I'm happy with. Now I wait for the battery to charge up so I can play with it.