You should wait until the iPhone gets released. You'll have the option to choose from the latest devices from both manufacturers.
Also, I've read reports about exploding batteries in Note 7 and samsung has stopped the production for further testing. So it would be better to wait until the...