i think your going in a better direction there. if/when you do get the motor i would check all the gaskets out, mainly the lower intake gaskets, they came with some pretty crumie gaskets and are prone to leak coolent into the motor.
i have no idea about the trannie.