See, I'm in the same situation as you. Well, was. My friend who works at apple is getting me a 25% discount, so it should be on its way.

But anyway, yeah, like I said, get it now. Who knows when the new iPhone will come out? June? December? Tomorrow? If you're waiting for this version, why not wait for the one next year, it'll be smaller and better.
And about half the stuff people are complaining about the iPhone are software problems, not hardware. Meaning, we'll get the stuff Apple needs to catch up on the current iPhone. I can live without 3G for now. Make sure 3G is even covered in your area before wanting it, too.
Short story: Get one ASAP!