Replying to IPhone 6 vs. Galaxy s6

So my phone contract ends soon and im having a hard time deciding whether i should get the iphone 6 or the galaxy s6, or just wait until september when the new iphone comes out, in hopes that it will bring updates to the phone's hardware to make it seem more comparable to the s6. ive always liked apple and their ui, as well as the continuity of their software (i have a macbook that i use with my current iphone 4s) but i am open to change too. i was pretty set on getting the iphone until i started looking more at the galaxy, and now im torn as the s6 looks like it blows the iphone 6 out of the water. ive done a fair bit of researching each phone and comparing the two, but id like to hear some opinions from you guys.