When good is not enough, Camshaft time again.

I'm looking forward to your results from the cam swap. Your combination should see high 10 sec passes with the correct torque converter (Dynamic). Good luck!