Same here. And assuming there's a new one this summer, I'm upgrading mine. I love my iPhone.
I had a 3G. Then I convinced myself that it was a good idea to give that one to my niece and bought the 3GS. I am hoping that the improvement for the next ones are won't make me upgrade already, I want to skip one version.
