Iphone 4, help me make the leap?

I have had a 3G (Jail-broke) for years now. I got my wife a 3GS (also Jail-broke) about 6 months ago, and its ridiculously faster. Im looking to upgrade now that I understand the difference in speed. Im considering either the 3GS or the 4, but I have heard that even the newer 4s have a issue with the antenna and dropped calls. Not sure it would make that big a difference since I use headphones 75% of the time, but I use my phone for business as well as personal, so, simple math, 25% of handheld, 1/2 or even 1/4 of those dropped is not good. This one issue is the ONLY thing keeping me from making the leap to the 4. Help me out here... :D