Well $2300 later with a complete rebuild, new torque converter, transmission cooler and lines it's shifting better than ever. The shop I took it to did a really great job. I'm still looking to probably replace it though. Just not sure with what. I'm more leaning towards a 2010 or newer E350 but...