904 build

So I recently built up a decent 360 .60 over est. h/p 375 ish( shoulda went bigger cam!) anyways did not take long before 2nd gear faded out on me!
Have a new 2800 stall converter. So back to the point, I am planning to rebuild on my own although the more I read, the more intimidating it seems to get!
I have ordered transgo tf-2 shift kit, and planning deluxe racing master overhaul rebuild kit from tcsproducts.com part # 148900dl , questions are should I be replacing pump gear set or return modual?? Are there other parts , hard parts that should be done? Special tools? I have slide hammer and ring pliers what else? Trans is out and cleaned up and empty, but have not opened her up yet. Another question the rebuild kit is for 1972 an on, I will be asking tcs techs but if anyone else knows the difference that would be handy. I know there is a lot of info here on FABO and I'm reading as much as I can, and on the net as well. But I have more faith in the members on this sight for correct info! Thanks