Since the iPad isn't getting released/announced on Oct 4th doubt I'll upgrade it first. Also, I use my iPhone for iTouch capability...so the decision is clear...iPhone!
why would that matter? I'm not sure if I like the notifications not taking up the whole screen like the iPhone. but can't wait to try the split keyboard.