You might end waiting longer and being more conflicted. It is rumored that the i5s is due out in July.
At the end of the day, if you keep waiting for the next big thing, you will never be happy. Get the device that meets your needs by testing them yourself. I personally have an issue with any device maker that has such tight controls over their ecosystem that they don't pay attention to the needs of the user and dictate the needs for the consumer as if they know better.
All of the high end smartphones are well made and designed. You are not going to find one device that has the best premium design with even better performance, speed and features. I prefer performance, speed and features over design. I also like the option to tweak my device and have the flexibility to add storage or a fresh battery.
Samsung has chosen to appeal more to those that value performance over style. It is a given that design is a good clear weakness but not a fatal one. Slap a Defender case on the GS4 and now we are down to substance over style. They fit a larger, higher definition display with an improved penile matrix, though I would have preferred an HD LCD display, into the same dimensions as the GS3. The device is thinner than the GS3 but has a larger battery to power the improved display and internals. The thinness even with a large Defender case will be even more pocketable.
Their focus on the user experience is what made me transition to Android instead of Apple from BlackBerry. The additions and improvements to the Nature UX skin will only help to improve the experience for existing users but also help the new user. Since the device has not yet been released, it is pointless to bemoan all of its shortcomings of which there are a few as hopefully some will addressed in the successor of the GS4.
None of us has the magic answer and you are right to continue your research and test drove all the devices in person.
Sent From My Samsung Galaxy Note 10.1 Tablet
I'm pretty much over wanting an iPhone. It's more or less between the S4 and the One now. There are things that each have that I want, which is really the hardest part. I'm starting to lean more towards the S4 again, but the One is certainly a nice looking phone and the speaker implementation is great. I wish Samsung would have done that with the S4.
It's probably just going to come down to which device provides the best audio quality and loudness. I'm just going to stick a pair of headphones into both devices and buy the one that sounds better. They're both great devices, so I think either will satisfy my needs otherwise. But music is the biggest one this time around because it's been something I've just settled with on past Andoid devices.