I m in a similiar situation, I work in Africa ( Can't get Apple), but I am going back to UK for a couple of weeks in 2 weeks time, so now is my only time to buy at least for the next 6 months. So I have set myself a deadline to only wait until this Thursday evening and I will buy a 12" G4 from UK Apple Store ( As I want to Max out Ram and up HD to 60GB, its on a 4 to 6 days build time, so should arrive by the time I arrive back in the UK.
Heres hoping that Apple don't upgrade next week, but if they do I will have to just live with and hey I'll still have a great Lap top.