I have to agree with 97TB. It seems to make more sense to hop up a TBS rather than a Tbird. I would start to worry about upgrading the brakes to deal with the quicker overall bike. With the TBS you already have the dual disk front brakes. There is always a ying and yang with performance upgrades. Once you upgrade one part of the bike you usually have to catch another part up to meet the increase in performance. How is that for a technical analogy?
