I was gonna suggest an LS, but I figured OP wanted to stay diesel. If gas is an option, an LS is the way to go. Get one cheap, and bolt it in. You can use the engine mounts for a 350 powered H1, with LS adaptors. You could also keep the factory TH400, or switch to a 4L60E/4L80E. If you could...