Get rid of your 3G. I just sent my 2 year old, dented 3G back to O2 and got £175 for it, which made the iPhone 4 a lot easier on the wallet.
I got so frustrated with how slow everything was even on 3.1, OS4 made it unbearable. A 3GS or 4 is a massive upgrade in usability.