I'd go with the TQ for the street manners & part-throttle efficiency & mileage, if not the EFI.
It sounds like the direction you prefer, and a bit of fun.
Putting the OD TF in there also makes sense.
I'd second the Scott Smith rebuild as well; you'll know it's been tested & problem-free.