Sadly I share the same feelings as you OP. I wish I hadn't sold my S2, I'd sell my S3 right now and wait for the next phone. I've never had an iPhone (had androids since the dream) before but I'm looking forward to checking it out.
This battery issue combined with a couple other things (crappy camera on my unit being anoyher big issue for me) that are bugging me are really making me wish I hadn't used my upgrade for this phone... I'm just not happy