Did the same thing back in May, but I went with the gas 6.4 engine, so far I am pleased with it. I had a 2008 Tundra crewmax 5.7 and it was a great truck and engine , not a single issue with it, got rid of it for the same issues you mentioned. I think the Tundra handled the heavy loads pretty well and to be honest I don't notice a huge difference in towing but it is nice not to have to worry about every little thing we pack causing the truck to be over on payload, the Ram I have has double the payload the Tundra had. The payload was the achillies heel of the Tundra and probably most half tons.