I'd say wait for E3. Chances of the PSP2 or 3DS releasing soon are slim, but at least they should give you an idea of when to expect them, if they're announced. Worst case is you end up waiting about a week.
Ignoring any future hardware, it depends on the types of games you want. They have really different styles of games. Sorry for a vague response.