Hi,
Getting into the middle 20s with that rig is actually pretty good, so I'd say you're on the right path.
Anything you can do to encourage top gear earlier is good, and torque converter lockup is good. There have been a few threads talking about forcing TC lockup, look for Orange4Boy's
"Freezing the Slushbox" for lots of good info on forcing lockup on his Previa. It won't be a 1:1 translation for you but there should be good info to help point your way.