agree, T5 is a good fit for your application (and more affordable) If $ not a real issue, then yes a TKO would be a nice upgrade. Here's
one way to do it. Your rear end gearing is what's killin ya - other options include more highway friendly rear gearing or even a Gear Vendors o/u drive. But the trans swap would still be a nice way to go. What's your rear tire outer diameter?