If I were doing it today, I would give great consideration to the Note2. However, you said that model was not in the running. In that case, I can think of nothing other than the S3.
I also had the T'Bolt for a little over a year, but I switched to the S3 shortly after it came out. Would I do it again? The answer is, Yes . . . without question. It's good in stock form and is even better unlocked, rooted and running a ROM (Synergy Jelly Bean).
One thing you'll notice over the T'Bolt is the battery life improvement. It's becomes an even greater difference when running a ROM. It's like night and day with the S3.
You'll also like the improved performance. I didn't happen to find the T'Bolt too bad, but now that I've been on the S3 running JB, the smoothness and responsiveness is without compare. You'll like the change.
One thing you won't like is the bloatware. Of course, you have that with the T'Bolt. However, there's some Samsung junk that's just as annoying - especially that useless S-Voice. If you ROM it, you can get rid of the junk you don't want and install Google Now to replace S-Voice. It's been ported over to ICS and it obviously runs on the JB ROMs. It's far superior to S-Voice and you should find it useful.