Unless you are going to tow (had to say that) I would install a late model 998/999 with the low gearset and lockup.
Better mileage and better 1st and 2nd gear launch. Less power loss too through the smaller trans.