As a squarebody guy, my heart says swap that big block in and fresh up the rest of the drivetrain and brakes and go. I'm making it more simple than it really is, but on the other hand, I get the want/need to get on the trail sooner and be reliable.
Swapping the box is an option for sure, but...