It's personal preference really which one fits in your hand and feels comfortable carrying. They both do the basics and come with features you'll use once and never again. So pick them up and hold them and slip them into pockets, that's about the best advice.
I'm due a upgrade too but have decided to just stay with my current galaxy and just buy an extended battery. There is no wrong choice it's just a gadget.