Should I Buy a PSP 3000 or Wait to Buy the NGP/PSP2?

Now that I've decided to get a PSP 3000 is I was to get a PSP, I am trying to figure out if I should purchase a PSP 3000 or wait for the NGP to come out and buy it. I really like the the NGP/PSP 2 because it has a built in GPS (which I'll use occasionally), 2 Analog Sticks (finally), a touch screen and a touch pad on the back. awesome titles coming out for it like Killzone, Uncharted, etc. will have a model with 3G capability, extremely powerful graphics, and much more. But the games will probably come at a steep price because it will be all-digital (right?). Also the system itself will be projected to be $300 - $350, which raises some concern for being the same price as a PS3, and I costs much, much more then the PSP 3000. On the other hand, the PSP 3000 come at a MUCH cheaper price at $130, but offers a lot less applications compared to the NGP. (I mean, how many handheld systems can say that they are as powerful as an Xbox? Not many). Also, the already established and wide range of UMD games come very cheap. Currently, I already have $170 saved (in GameStop trade-in credit) for one of these systems so I need to decide: which handheld gaming system should I get between these two?