3GS dying... Get the iPhone 4S or hold off?

The title says it all, really...

I have an iPhone 3GS that I've had for a couple years or however long and it's starting to finally show the results of a long and rough life. I'm looking to replace it as soon as possible but have debated waiting for the iPhone "5" if that comes out in June (unlikely) or October.... thoughts?