Honestly, if price is not a big deal, there are only four things you need to decide on.
1. Is it for yourself only? (Instead of a family device.) Y/N
2. Is a camera important? Y/N
3. Are you a resolution junkie? Y/N
4. Do you want a more portable iDevice? Y/N
If mostly Y, then go for a Touch. Otherwise, an iPad.😉
PS: Waiting for the iPad 2 is good in theory, but it isn't even announced yet, and unless Apple pulls an imminent release, (which won't happen), it will be alot more than "a few weeks". Ever heard of "Should I eat a brownie or wait?"