727 swap

Lighter, less hp drag and you shouldn't have to mess with your driveshaft. Get a 904 yoke and it should be really close.