Scratch

I am in the market for a new Apple product, either the iPod 4 or the iPad. I will let you know of what got me here first:

I have owned a iPod 2 (or 2nd gen) for 2 years now, and really need to upgrade. I updated it to OS4, but was saddened by no Springboard (aka Home Screen) background picture, no muti-tasking, or lock orientation. I would like all of that.

I understand the strengths and weaknesses (I would get an iPod 4 for its portability, camera, and gyroscope. I would get an iPad for it's 10' screen and because it would replace the laptop I had) of both products, but would like some input as to what you would get and why. Also, is Apple to come out with an iPad that has a camera? I might wait then.