Hans,
Every thing is looking good for the transmission end. The 57 tranny will bolt to the 53 bellhousing, and will accomodate the larger 11 inch clutch setup.
I am not sure of the waterpump, but I would assume you need the short shaft pup and an adapter.
Good Luck and Welcome
John