tranny issues

I have a 90 GT with an AOD. It has decided that it doesn't want to shift past 2nd. I am taking it to be rebuilt/overhauled. I have 2 questions.

1- Other than a shift kit and tranny oil cooler is there anything else I should be adding while this is being done?

2- Will the "street/strip" shift kit be too much for a N/A street car or should I get the "passenger car" kit. Those appear to be the 2 choices from B&M.

Thanks