2G to 3GS upgrade is a no-brainer.

3G to 3GS, I'm not really sure if it's worth it.

FYI, iPhone 3.0 software was leaked a few days ago. Installed it on my 2G and some of the features are pretty cool (especially landscape texting, email, everything).