Probably use the MTL. It worked pretty good for me on both counts. I had some rough engagement in 3rd gear, not a grind but not as smooth either. That was under the ATF. Then I went to redline and it was gone and has been gone for a two years.

Just a quick note:
That Royal Purple MaxGear is working great!
It has completely quieted down the mechanical noise from the Torsen LSD in hard sharp turns from a stop, and it seems to have hardly affected the shifting. There have been some cold mornings here and it has still shifted fine with no roughness. IT seems maybe a fraction more resistive about shifting on those cold mornings when I first start up to leave, but once up to operating temperature it shifts great and is much quieter to boot.

Former owner of '99 CSVT - Silver #222/2760 356/334 wHP/TQ at 10psi on pump gas! See My Mods '05 Volvo S40 Turbo 5 AWD with 6spd, Passion Red '06 Mazda5 Touring, 5spd,MTX, Black