That sounds great! Sounds like you'll have a good car to sell, too.
Looks like mine will be almost new once done, since the tranny has issues too (popping out of 6th; ran low on fluid when I got it due to leaky axle seal...ugh)
Know anyone from Heuberger with experience on rebuilding these 6-speeds? Even tranny shops in town don't want to touch these 6-speeds since they're finicky apparently. I found a guy up in Denver (ZF Design) that came recommended by Revolutions as well as Flatirons, so he definitely knows his stuff, but it'll be $900 just in labor to disassemble and reassemble, plus the parts that need replaced of course.