First off, I have an iPhone 3g (not 3gS) and I completely like the iOS platform. I have looked into Droids and while they are interesting, I'm going to stay loyal to the iPhone. THIS IS NOT AN IPHONE VS. DROID THREAD, PLEASE DON'T TELL ME TO GET A DROID! So, that's out of the way...
I currently have an iPhone 3g from a couple of years ago or more. I'm happy with it but it's getting slow and I've tried everything I can to speed it back up to what it once was aside from completely deleting all of my apps. Facebook takes 5 minutes to load sometimes. Text messages and typing are sometimes extremely laggy. I'm assuming that this is because my phone is so damn old and all of the new stuff is designed for better hardware.
I'd also like a video recorder and a better megapixel camera. I know that the iPhone 4 offers all of that. I'm wondering if the next-gen iPhone will be that much of an improvement over what I currently have that it'd be worth it to wait.
Another option would be to wait for the next-gen iPhone to be released so I can get an iPhone 4 for much less than $200-300.
What is the opinion of current iPhone 4 users and people in the know about next-gen iPhone features?