The only real solution at this point is to wait for the update. But it is my belief Apple won't do to much, as they want everyone to upgrade to the iPhone 4.
I was in your shoes and couldn't take it any longer, so I upgraded to the iPhone 4. So far I am glad I did, everything is much faster even my download speeds when on the 3G network.