It's done!
The 3 - 2 downshift problem is not normal. Recheck it all for something out of the norm and make it dead in spec.
Thats the oil I have used in the past. I now use the Mobil Sythn. oil, similar/same weight.
Theres a formula around here somewhere that can tell you what gear you need.
Tell me what size tires you have now and what gear ratio you have.