An easy transmission swap is to a Muncie or Saginaw 4 speed, no driveshaft change required, just a shifter thru the floor where it belongs. it made a world of difference and a lot more fun in my Nova wagon with just about the same engine mods. If you use the saginaw you can make it into an overdrive!
