The iOS4 beta 2 has just been released to developers. That's mean you can expect it to come to your iPhone 4 in a few weeks time.
The waiting for the final iOS 4.1 release is definitely worth it. According to most reports, the iOS 4.1 beta 2 finally fixes the irritating proximity sensor issue (even though the problem seems to be caused by faulty hardware rather than some software bugs).