2007 WRX TR OR 2011 STI?

I currently own a black 2007 WRX TR. I bought it new and the dealership added all of the Subaru Performance Tuning (SPT) parts before I purchased it. It has around 29,000 miles on it and has really been babied. My extended warranty runs out in December and I am considering buying either a 2011 WRX or a 2011 STI. I really don't know what the actual horsepower is on the TR after the SPT parts were added, but with the short throw shifter, it's pretty quick. Should I buy the 2011 WRX or the 2011 STI?